много всего 2
Merge remote-tracking branch 'origin/master'

Conflicts:
	Data/Migrations/Configuration.cs
	Data/Models/Order.cs
	Implementation/Managers/OrderManager.cs
	room42/Controllers/AdminController.cs
	room42/Controllers/EmailController.cs
	room42/Controllers/HomeController.cs
	room42/Models/OrderCreateView.cs
	room42/Views/Admin/Index.cshtml
	room42/Views/Admin/Orders.cshtml
	room42/Views/Admin/OrdersHistory.cshtml
	room42/Views/Email/OrderCreatedToOwner.html.cshtml
	room42/Views/Home/Orders.cshtml
	room42/room42.csproj