fix vdb avro link
Fixed bug that caused class cast exception
Merge branch 'master' into elie
Merge pull request #2 from interdroid/bugfixes

Fixed documentation (test)
Made value_path recognize strings (single quotes) as well, so that they
can contain more than just identifier-characters.
Merge remote-tracking branch 'origin/master'
Fixed typo
Merge pull request #3 from interdroid/bugfixes

Bugfixes (Documentation fix - Practice)
Removed old Cuckoo libs, inserted new lib.
Updated classpath and project.properteis for new ADT
Removed Cuckoo Train Sensor (now in separate package).
Added AbstractCuckooSensor and additional classes
Merge branch 'bugfixes' of git@github.com:interdroid/interdroid-swan.git into bugfixes
Merge pull request #4 from interdroid/bugfixes

Bugfixes related to new ADT and newer Cuckoo version
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
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