1111
Merge branch 'master' of https://github.com/taxfromdk/TeaterApp

Conflicts:
	teaterapp/show/templates/base.html