Merge branch 'abyssinian-nightjar' of github.com:iPlantCollaborativeOpenSource/atmosphere
Merge branch 'abyssinian-nightjar'
Merge branch 'abyssinian-nightjar'
Merge branch 'abyssinian-nightjar'
Merge branch 'abyssinian-nightjar'
Fix email workflow for the feedback endpoint.
	modified:   api/email.py
	modified:   core/email.py
Merge branch 'abyssinian-nightjar' of https://github.com/iPlantCollaborativeOpenSource/atmosphere
Merge branch 'abyssinian-nightjar' of github.com:iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar
Merge branch 'master' of github.com:iPlantCollaborativeOpenSource/atmosphere into abyssinian-nightjar