Edit de la modal edit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/FMM/FindMyMovieBundle/Resources/views/Profile/profile.html.twig
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	web/css/style.css
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/FMM/FindMyMovieBundle/Resources/views/Profile/profile.html.twig
Page home
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/FMM/FindMyMovieBundle/Resources/views/Default/javascripts.html.twig