Merge origin/sprint1.5 into sprint1.5

Conflicts:
	HomeCinema-ejb/nbproject/project.properties
	HomeCinemaAdmin-war/nbproject/project.properties
	nbproject/project.properties