test
Merge branch 'master' of https://github.com/Delavy/imdb

Conflicts:
	imdb-model/src/main/resources/hibernate.cfg.xml
	imdb-web/src/main/webapp/vues/page/page-afficher-film.jsp