1
Merge branch 'master' of https://github.com/amirhancheg/Empty

Conflicts:
	Empty.v11.suo
Merge branch 'master' of https://github.com/amirhancheg/Empty
новости
Merge branch 'master' of https://github.com/amirhancheg/Empty

Conflicts:
	Empty.v11.suo
	UI/WebSite/WebSite.csproj
	WebTycoon.Mvc/Libraries/WebTycoon.Mvc.Web/Controllers/AdminController.cs