Merge remote-tracking branch 'origin/bugfixes' into rob
Merge remote-tracking branch 'origin/bugfixes' into rob
- Added icons and to manifest and resources.
- Code added to retrieve icon bitmap
- Some debug system.out prints
- Vibrate disabled in the testReceiver
- Disabled (commented) some debug messages
- added units (to manifest, beta) and methods to pass these
Merge remote-tracking branch 'origin/bugfixes' into rob

Conflicts:
	AndroidManifest.xml
	src/interdroid/swan/ContextManager.java
	src/interdroid/swan/contextexpressions/ContextTypedValue.java
	src/interdroid/swan/contextexpressions/Expression.java
Merge remote-tracking branch 'origin/bugfixes' into rob
Merge remote-tracking branch 'origin/bugfixes' into rob
- Added status_text valuepaths to BatterySensor and HeartRateSensor
- Fixed sensors:
	- Light
	- Pressure
	- Screen(?)
	- SignalStrength
	- Sound (?, doesnt update)
	- Time (shows currentmillis, but doesn't update)
Merge branch 'cross-device' into rob

Conflicts:
	AndroidManifest.xml
	project.properties
	res/values/dimens.xml
	src/interdroid/swan/ContextManager.java
	src/interdroid/swan/ContextServiceConnector.java
	src/interdroid/swan/SensorInfo.java
	src/interdroid/swan/contextservice/ContextService.java
	src/interdroid/swan/contextservice/SensorManager.java
	src/interdroid/swan/sensors/impl/LightSensor.java
	src/interdroid/swan/sensors/impl/PressureSensor.java
	test/interdroid/swan/test/TestReceiver.java
updated location sensor to also produce location objects as well as
bearing and accuracy
Fixed default value for history length in configuration activity.
Updated test activity.
added toast message and check to test app