Задание to task
Merge remote-tracking branch 'origin/master'

Conflicts:
	OnlineShopTime/OnlineShopTime/App_Data/ShopDB.mdf
	OnlineShopTime/OnlineShopTime/App_Data/ShopDB_log.ldf