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
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