add change
ok
ok
ok
Merge branch 'master' of https://github.com/Symfomany/cinhetic

Conflicts:
	src/Cinhetic/PublicBundle/Resources/views/Directors/edit.html.twig
	src/Cinhetic/PublicBundle/Resources/views/Movies/index.html.twig
	src/Cinhetic/PublicBundle/Resources/views/Movies/searchpage.html.twig
ok
add several changes