Added intelliJ Idea .iml files to .gitignore
modified project file
Merge branch 'master' of git://github.com/jcu-eresearch/jcu.dc24.ingesterapi
Updated some comments
Merge branch 'master' of git://github.com/jcu-eresearch/jcu.dc24.ingesterapi
Merge branch 'master' of git://github.com/jcu-eresearch/jcu.dc24.ingesterapi
Merge branch 'master' of git://github.com/jcu-eresearch/jcu.dc24.ingesterapi
added git ignore for intellij project files
Merge branch 'master' of git://github.com/jcu-eresearch/jcu.dc24.ingesterapi

Conflicts:
	jcu.dc24.ingesterapi.iml
Updated import
Merge branch 'master' of git://github.com/jcu-eresearch/jcu.dc24.ingesterapi
Merge branch 'master' of git://github.com/jcu-eresearch/jcu.dc24.ingesterapi
Merge branch 'master' of git://github.com/jcu-eresearch/jcu.dc24.ingesterapi

Conflicts:
	jcudc24ingesterapi/ingester_platform_api.py
Merge branch 'master' of git://github.com/jcu-eresearch/jcu.dc24.ingesterapi

Conflicts:
	jcudc24ingesterapi/models/dataset.py
Merge branch 'master' of git://github.com/jcu-eresearch/jcu.dc24.ingesterapi
Merge branch 'master' of git://github.com/jcu-eresearch/jcu.dc24.ingesterapi
Merge branch 'master' of git://github.com/jcu-eresearch/jcu.dc24.ingesterapi
Merge branch 'master' of git://github.com/jcu-eresearch/jcu.dc24.ingesterapi
Merge branch 'master' of git://github.com/jcu-eresearch/jcu.dc24.ingesterapi
Added bootstrap.py for self contained deployment

Added Intellij Idea project files to gitignore