Hello
Merge branch 'master' of https://github.com/patbosc/mirar

Conflicts:
	Sensorbook/Sensorbook/Models/Sensor.cs