Backport ATMO-370 to Herja
BUGFIX - Monitor_instance_for_user was showing 0 time used for users with active instances
Merged conflicts in spacing
Merge conflicts resolved
Represent the nested object instead of name
Merge branch 'abyssinian-nightjar' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into ATMO-371
Added new endpoints for add/remove a Application/Instance/Volume to a project in a RESTful way
Remove old TODO