Minor fixes
Merge branch 'master' of https://github.com/crillesvensson/WebApplikationer

Conflicts:
	Group4Shop/src/main/java/dit126/group4/group4shop/core/Product.java
Merge branch 'master' of https://github.com/crillesvensson/WebApplikationer