Merge
Merge branch 'master' of
https://github.com/ChristofTorres/eShop-Common.git

Conflicts:
	eShop Common/src/shop/common/interfaces/ShopInterface.java