Kleinigkeiten
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/layouts/master.blade.php
	app/views/movies/show.blade.php