zoznam filmov so strankovanim
merge
Merge branch 'master' of https://github.com/ondrejjarab/MovBase

Conflicts:
	src/java/sk/movbase/controllers/FilmController.java