Merge origin/sprint1.5 into sprint1.5
Merge origin/sprint1.5 into sprint1.5
Merge origin/sprint1.5 into sprint1.5
Merge origin/sprint1.5 into sprint1.5

Conflicts:
	HomeCinema-war/web/components/header.xhtml
	HomeCinema-war/web/css/main.css.map
	HomeCinema-war/web/scss/main.scss
trand en ok + cookie locale
Merge origin/sprint1.5 into sprint1.5

Conflicts:
	HomeCinema-war/web/components/header.xhtml
	HomeCinema-war/web/css/main.css.map
	HomeCinema-war/web/scss/main.scss
Merge origin/sprint1.5 into sprint1.5

Conflicts:
	HomeCinema-ejb/nbproject/project.properties
	HomeCinema-war/nbproject/project.properties
	HomeCinema-war/web/components/header.xhtml
	HomeCinema-war/web/index.xhtml
	HomeCinema-war/web/js/main.js
	HomeCinema-war/web/resources/ezcomp/login.xhtml
	HomeCinemaAdmin-war/nbproject/project.properties
	nbproject/project.properties
Nettoyage de la navigation par ManagedBean dans mon compte, remplacer par une navigation purement JS
history.pushState
fix sidebar
init paging
fix part of css
fix css firefox (dégradé) + fix bug compléter caddie
ajout regex signup pseudo
Fix Javascript on moncompte
Merge origin/sprint1.5 into sprint1.5

Conflicts:
	HomeCinema-war/web/css/main.css.map
fiche film (+ -)
Merge origin/sprint1.5 into sprint1.5
maj fonction product + fix divers
rexherxhe en sql natif