Pretty print instance_screen.js
Pretty print router.js
List instances no longer async
These changes were uncommited, but necessary for running production between gunnr-beta and gunnr
Add loader circle to instances page
Fix instance selection on load
Add text your instances are loading
Fixed merge conflicts between stable(gunnr-beta) and gunnr
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into stable
Change version to "help" QA.

* Explicitly use the date on the UI.
* The short git sha is clickable to goto the source tree.

	modified:   resources/js/cf2/router.js
Added flower to atmo-prod, available only to core-services
Merge branch 'atmo-275' into gunnr

Conflicts:
	resources/js/cf2/router.js
Merge branch 'gunnr' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into stable
Check if time_period exists. Add to allocation task.

	modified:   service/allocation.py
	modified:   service/instance.py
	modified:   service/tasks/allocation.py
Changes Steve made for production.
	modified:   service/tasks/allocation.py
Merge remote-tracking branch 'origin/gunnr' into stable
Changed dist/conf files to allow flower authentication
Set metadata to empty when machine._image is None
Fix loading with no instances bug
Changed to the clear_empty_ips task to make it run periodically