Merging PrimeSense
Merge branch 'master' of https://github.com/chte/SolarSense

Conflicts:
	src/input/SensorManager.cpp
Merge branch 'master' of https://github.com/chte/SolarSense