changes
Merge branch 'master' of git@github.com:Florry/webshopProject.git

Conflicts:
	src/se/jiv/webshop/service/ProductService.java