Fix for Issue #334
Fix for Issue #336
Fix for Issue #338
Fix for Issue #340
Merge pull request #335 from wettenhj/issue_334

Fix for Issue 334
Merge pull request #337 from wettenhj/issue_336

Fix for Issue 336
added migration for unique datafiles
Merge pull request #341 from wettenhj/issue_340

Fix for Issue 340
Fixed indentation.
Merge pull request #339 from wettenhj/issue_338

Fix for Issue 338
refactored api for better readability
Merge branch 'mytardis_develop' into develop
Merge branch 'develop' of https://github.com/wettenhj/mytardis into develop

Conflicts:
	tardis/tardis_portal/api.py