Merge branch 'origin/master'
name environment correctly in config
Merge branch 'origin/staging'

Conflicts:
	config/environment.py
Merge branch 'master' into production