Merge origin/sprint1.5 into sprint1.5

Conflicts:
	HomeCinema-ejb/src/java/ejbs/admin/ManageProduct.java
Merge origin/sprint1.5 into sprint1.5