Sensor bug fixes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Purple Robot Manager/project.properties