Merge branch 'herja' of https://github.com/iPlantCollaborativeOpenSource/atmosphere

Conflicts:
	resources/js/cf2/views/sidebar/instance_list_item.js
Merge branch 'abyssinian-nightjar' of github.com:iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar
Merge branch 'abyssinian-nightjar' of github.com:iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar
Fix merge conflicts in instance list item
Unauthenticated users can view application detail api response