resolution probleme private 2
Merge branch 'sprint1-css' of https://github.com/berthise/HomeCinema into sprint1-css

Conflicts:
	.gitignore
	HomeCinema-war/nbproject/private/private.properties