d
Merge branch 'master' of https://github.com/LebedevAntony/hackProject

Conflicts:
	SolarWind/SolarWind.WebUI/Scripts/site.js
	SolarWind/SolarWind.WebUI/Views/Home/Index.cshtml
	SolarWind/SolarWind.v11.suo