Merge branch 'master' of https://github.com/los-aburridos/filmverwaltung

Conflicts:
	templates/index.html
Merge branch 'master' of https://github.com/los-aburridos/filmverwaltung

Conflicts:
	templates/index.html