Merge pull request #246 from scitran/data-model-v2

api/dao/containerstorage.py

api/dao/hierarchy.py

api/handlers/collectionshandler.py

api/handlers/containerhandler.py

api/jobs/jobs.py

api/jobs/rules.py

api/placer.py

api/upload.py

bin/database.py

raml/schemas/definitions/acquisition.json

raml/schemas/definitions/analysis.json

raml/schemas/definitions/collection.json

raml/schemas/definitions/container.json

raml/schemas/definitions/file.json

raml/schemas/definitions/job.json

raml/schemas/definitions/project-template.json

raml/schemas/definitions/project.json

raml/schemas/definitions/session.json

raml/schemas/definitions/subject.json

raml/schemas/input/collection-update.json