Bad merge. Removed extra diff artifacts.
	modified:   api/project.py
Merge branch 'abyssinian-nightjar' of github.com:iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar

Conflicts:
	api/project.py