Merge branch 'master' of https://github.com/TheNabo1/SmartShoppingServer

Conflicts:
	nbproject/private/private.xml
Adding Promotion (OV, Rep) + TypePromotion (OV)