made photologue
made email
Merge branch 'develop'

Conflicts:
	bombardier/settings.py
made email