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

Conflicts:
	SolarWind/SolarWind.WebUI/Scripts/site.js
ghjghj
Merge branch 'master' of https://github.com/LebedevAntony/hackProject
FINAL!!!