Merge origin/master

Conflicts:
	Shop-ejb/src/java/Session/ProductSessionBean.java
	Shop-war/src/java/webservices/ProductService.java
	Shop-war/web/Scripts/account/controllers.js
	Shop-war/web/Scripts/glisseAngular.js