Merge origin/master

Conflicts:
	src/main/java/de/hsos/kbse/movie/impl/MovieLister.java
	src/main/java/de/hsos/kbse/moviefinder/impl/csv/CSVMovieFinder.java
	src/main/java/de/hsos/kbse/movielister/jeemovielister/ui/Uimodel.java