Merge branch 'master' into feature/auth

Conflicts:
	bakery/settings/base.py
Merge branch 'feature/auth'

Conflicts:
	bakery/settings/base.py