Merge branch 'master' of https://github.com/martincallesen/Web_Shop

Conflicts:
	core/src/main/java/dk/sonderbye/webshop/domain/WebShop.java
	core/src/test/java/dk/sonderbye/webshop/domain/WebShopTest.java
merged with master