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

Removed database from repository

Conflicts:
	database.db
	static/js/coffee/main.coffee