FilmController modified
Merge branch 'master' into domainlayer