fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	OnlineShopTime/OnlineShopTime/Controllers/OfferController.cs