fix vdb avro link
Fixed bug that caused class cast exception
Merge branch 'master' into elie
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)
Made SWAN more modular. Moved runtime stuff out of swan song into
engine.

Updated SWAN song to make everything an expression. Made a distinction
between Value Expressions and TriState Expressions.

Added Cross Device Swan. 

Many Fixes to sensors.

Updated grammar
Added support for more statistics in the QueuedExpression and thus in
the expression viewer activity
Important fix to the getvaluesfortimespan to a bug caused by the values
being expected in the order oldest to newest, while the new order is
newest to oldest
Merge remote-tracking branch 'origin/elie' into cross-device
Fixed project.properties
updated test activity and swan lake logo
Merge branch 'elie' into cross-device

Conflicts:
	test/interdroid/swan/test/TestActivity.java