test2
Merge branch 'master' of https://github.com/FominArtmind/SensorNet

Conflicts:
	SensorNetGit.vcxproj.user