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

Conflicts:
	SolarWind/SolarWind.WebUI/Views/Home/_Canvas.cshtml
	SolarWind/SolarWind.v11.suo
f
Merge branch 'master' of https://github.com/LebedevAntony/hackProject