branch for the current "testing" version, that can be used to test new features
merged in from unstable: project target API changed to Android 2.1 (7)
merge in changes from unstable branch:
- use HTTPS url
- preferences for PhoneState sensors
- sensor name for 'reaction time' sensor
- 'display name' field for data points
- deprecated 'local storage' preference
- use application resources for intent actions and local storage provider
merged in changes from unstable branch:
- imported all generic sense platform back end code from the sense-platform-app project
- minor changes to local storage handling of sensor names and descriptions
merged in changes from unstable branch:
- removed support for Android 1.6 and older (API < 7)
- removed old non-standard Bluetooth library
- improved behaviour with large amounts of data or very bad connectivity
- fixed bugs in HxM sensor
- fixed issue with screen activity sensor missing events
- fixed issue with location sensor switching on GPS without consent
merged in changes from the unstable branch:
- centralized sensor registration
- fixed issue with location sensor in auto-gps mode
- fixed support for dev server
merged in changes from unstable branch:
- added logout functionality to service stub
- fixed issues with registration of multiple sensors with identical names
- added support for NFC
- added drawables for XHDPI and Android 3.0+
- minor fixes in PhoneGap plugin
merged in changes from unstable branch:
- added audio spectrum sensor
- added OBD-II support
- added camera light sensor
- added temperature sensor
- new callback system for SenseService calls to replace blocking calls to changeLogin en register
- update to Cordova 1.5.0 (previously PhoneGap)
merged in changes from unstable branch:
- add outgoing call processing
- fix issue with restarting service after crash in iVitality
- made toggleXxx methods synchronized
- added Android Compatibility library for Notification.Builder
- minor changes after update to ADT r17
merged in changes from unstable branch:
- removed pop quiz/questionnaire code
- fixed small deprecation issues, shut up remaining warnings about deprecation, removed some unused resources
- do not check any settings when showing NFC popup: it cannot be disabled anyways
- use DialogFragment for NFC scan sensor
- remove unused /lib folder
- Added a loudness sensor. This sensor gives a value between 0-10 as indication of loudness in the past 10 minutes. It stores a minimum and maximum value logged at the device to make the scale.
- corrected spellingmistake: SERIE to SERIES
- added call to flush data buffer to PhoneGap plugin
- added bluetooth neighbour count
- added an experimental version of a travelled distance sensor. Updated every hour
- cleanup some unused imports
- made sense service sticky, i.e. actually restart it when it was killed
trying to merge all eligable revisions from unstable branch
- added dummy app widget reciever for apps that do not have an app widget
manually merged changes from unstable branch... GODVERDOMME SVN!
- added getRemoteData call to PhoneGap plugin
- updated NFC dialog to use Fragments
- switched to single-process architecture
- bugfixes in loudness sensor, audio spectrum, motion energy & bluetooth scanning
- sensor registration is done by separate service
merged in changes from unstable branch:
- added GCM registration functionality
- fixed handler implementations in MsgHander and SenseService
- improved sensor ID verification
- included .classpath and .project for easy importing in Eclipse
- updated to PhoneGap 2.0.0
Merge branch 'unstable' into testing

Conflicts:
	AndroidManifest.xml
	default.properties
	src/nl/sense_os/service/commonsense/SenseApi.java
	src/nl/sense_os/service/constants/SenseUrls.java
	src/nl/sense_os/service/push/GCMReceiver.java
Merge branch 'unstable' into testing
Merge branch 'testing' into unstable