Added deploy_error as a 'build' task, so that it is not counted as 'active' time.
Merge branch 'gunnr' into herja
Fix string formatted error in atmo_init_full modify_rclocal.
	modified:   init_files/v2/atmo_init_full.py
Update sha1sum for vnc-config.sh
	modified:   init_files/v2/atmo_init_full.py
Temporarily disable resize button until patch release
	modified:   resources/js/cf2/templates/instance_screen/instance_info_tab.html
	modified:   resources/js/cf2/templates/instance_screen/instance_tabs_holder.html
	modified:   resources/js/cf2/views/instance_screen/resize_instance_form.js
Merge commit 'ea15487' into herja
Fix a string formatting problem.
Merge branch 'herja' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into herja
These hotfixes were made on Maintenance day during final testing of the release
Deprecated set_metadata functionality for save_app_data
New model: core.Project, with API endpoint /api/v1/project/<id> completed, Serializer completed w/ context
Complted Project model and API endpoints. Instances and Volumes will auto-assign the Default Project