Merge branch 'atmo-299' into gunnr

Conflicts:
	api/occupancy.py

	modified:   api/occupancy.py
Changed tasks to reflect state.. When the migration/imaging process is happening status is 'imaging', once complete status will be 'processing'
Merge branch 'atmo-291' into gunnr
Changed status lines to show processing AFTER imaging, and include the new_image_id if failure occurs
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into gunnr
Removed UserManagement API urls from urls.py until they are completed
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere