More of Matts changes
Merge branch 'master' of https://github.com/goingpaper/project

Conflicts:
	project/barreviews/templates/barreviews/bars.html
	project/barreviews/templates/barreviews/drinks.html
	project/project.sqlite3