del SandBoxDE.suo
Merge branch 'master' of https://github.com/alexkasp/votchina

Conflicts:
	web/SandBoxDE.suo
Update
upd
upd
upd
Merge branch 'master' of https://github.com/alexkasp/votchina

Conflicts:
	web/SandBox.WebUi/SandBox.WebUi.Publish.xml
	web/SandBox.WebUi/SandBox.WebUi.csproj
	web/SandBoxDE.suo