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

Conflicts:
	Group4Shop/src/main/java/dit126/group4/group4shop/core/Group4ShopFactory.java
	Group4Shop/src/main/java/dit126/group4/group4shop/core/IGroup4Shop.java
	Group4Shop/src/test/java/dit126/group4/group4shop/core/TestProductCatalogue.java