Änderungen
Merge branch 'master' of
https://github.com/DanielBo/InternetMovieDatabase

Conflicts:
	InternetMovieDatabase/src/controller/Controller.java
	InternetMovieDatabase/src/view/MainWindow.java