Merge branch 'origin/staging'

Conflicts:
	config/environment.py
committing something. i'm not sure what.