Merge origin/master

Conflicts:
	Shop-ejb/src/java/ViewModel/VMProduct.java
	Shop-war/web/Css/Global.css