New changelist
forms
Merge branch 'master' of github.com:apedan/start-symfony

Conflicts:
	src/Film/Bundle/Controller/FilmController.php
	src/Film/Bundle/FilmService.php