Changed: All, finished sheet 3 - thkaemmerling

Finally done
Merge remote-tracking branch 'origin/master'

Conflicts:
	Meilenstein3/favoriten.html
	Meilenstein3/js/film_json.js
	Meilenstein3/js/music_json.js