Demo
Merge
Merge branch 'master' of https://github.com/abhshkrv/pizza

Conflicts:
	HQServer/HQServer.WebUI/Controllers/ShopController.cs