Merge branch 'master' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into stable
Merge branch 'stable' of https://github.com/iPlantCollaborativeOpenSource/atmosphere into stable
Small changes to production from Feb 4 and Feb 5.
	modified:   api/__init__.py
	modified:   scripts/migrate_images.py
	modified:   service/tasks/volume.py
	modified:   templates/application/login.html
Merge branch 'stable' of github.com:iPlantCollaborativeOpenSource/atmosphere
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere