Fiche film
Fiche film
Merge origin/sprint1.5 into sprint1.5

Conflicts:
	HomeCinema-lib/src/exception/DeactivatedProductException.java
	HomeCinema-war/web/fiche_film.xhtml
	dcs/diag_fiches.dia
Merge origin/sprint1.5 into sprint1.5

Conflicts:
	HomeCinema-lib/src/exception/DeactivatedProductException.java
	HomeCinema-war/web/fiche_film.xhtml
	dcs/diag_fiches.dia
Merge origin/sprint1.5 into sprint1.5
Merge origin/sprint1.5 into sprint1.5

Conflicts:
	HomeCinema-lib/src/exception/DeactivatedProductException.java
	HomeCinema-war/web/fiche_film.xhtml
	dcs/diag_fiches.dia