index + début page films.xhtml
(properties)
Merge origin/sprint1.5 into sprint1.5

Conflicts:
	HomeCinema-ejb/nbproject/project.properties
	HomeCinema-war/nbproject/project.properties
	HomeCinema-war/web/css/main.css.map
	HomeCinema-war/web/moncompte.xhtml
	HomeCinemaAdmin-war/nbproject/project.properties
	nbproject/project.properties