Merge origin/master

Conflicts:
	src/Sensors/Sensor.java