Updating to Django
Merge branch 'master' of https://github.com/funkswing/HausBrew

Conflicts:
	app.yaml
	main.py
	templates/04main_bodymain.html