Merge origin/sprint1.5 into sprint1.5

Conflicts:
	HomeCinema-client/src/main/JeuDeTest2.java
	HomeCinema-client/src/main/JeuDeTestRobin.java
	HomeCinema-client/src/main/JeuDeTestStruct.java
	HomeCinema-client/src/main/JeuDeTestStructActivation.java
	HomeCinema-client/src/main/JeuDeTestStructUser.java
	HomeCinema-war/nbproject/project.properties