GPS
Merge remote-tracking branch 'origin/master'

Conflicts:
	OSGI_Bundle_Sensor/bin/osgi_bundle_sensor/SensorService$1.class
	OSGI_Bundle_Sensor/bin/osgi_bundle_sensor/SensorService.class
	OSGi_Bundle_GPS/bin/osgi_bundle_gps/GPS_Service.class