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

Conflicts:
	SensorNet.pro