Исправил ошибку с отображением значка состояния на странице Resources.aspx
Удалил лишние файлы
del suo
Merge branch 'master' of https://github.com/alexkasp/votchina

Conflicts:
	web/SandBox.Connection/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	web/SandBox.Data/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	web/SandBox.Db/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	web/SandBox.Log/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	web/SandBox.TestConnection/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	web/SandBox.TestConnection/obj/x86/Debug/GenerateResource.read.1.tlog
	web/SandBox.TestConnection/obj/x86/Debug/GenerateResource.write.1.tlog
	web/SandBox.WebUi/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	web/SandBoxDE.suo
	web/StopRschByEvent/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	web/StopRschByEvent/obj/x86/Debug/GenerateResource.read.1.tlog
	web/StopRschByEvent/obj/x86/Debug/GenerateResource.write.1.tlog