merged in from testing branch: 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
- 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 testing 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
- centralized sensor registration
- fixed issue with location sensor in auto-gps mode
- fixed support for dev server
- 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
updated the obd2 sensor
- small fixes to SensePlugin
- make SenseService sticky
merged in changes from testing 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
- 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)
added tag and branch properties in Subclipse
Merge branch 'testing'

Conflicts:
	AndroidManifest.xml
	default.properties
	libs/android-support-v4.jar
	res/values/strings.xml
	res/xml/nfc.xml
	src/com/phonegap/plugins/sense/SensePlugin.java
	src/nl/sense_os/service/DataTransmitter.java
	src/nl/sense_os/service/ISenseService.aidl
	src/nl/sense_os/service/MsgHandler.java
	src/nl/sense_os/service/SenseService.java
	src/nl/sense_os/service/ambience/NoiseSensor.java
	src/nl/sense_os/service/commonsense/SenseApi.java
	src/nl/sense_os/service/commonsense/SensorRegistrator.java
	src/nl/sense_os/service/constants/SensePrefs.java
	src/nl/sense_os/service/constants/SenseUrls.java
	src/nl/sense_os/service/constants/SensorData.java
	src/nl/sense_os/service/deviceprox/BluetoothDeviceProximity.java
	src/nl/sense_os/service/deviceprox/NfcScan.java
	src/nl/sense_os/service/external_sensors/NewOBD2DeviceConnector.java
	src/nl/sense_os/service/external_sensors/OBD2Dongle.java
	src/nl/sense_os/service/external_sensors/ZephyrHxM.java
	src/nl/sense_os/service/location/LocationSensor.java
	src/nl/sense_os/service/motion/MotionSensor.java
	src/nl/sense_os/service/phonestate/SensePhoneState.java
	src/nl/sense_os/service/provider/SNTP.java
	src/nl/sense_os/service/states/AbstractStateMonitor.java
	src/nl/sense_os/service/storage/LocalStorage.java
	src/nl/sense_os/service/storage/ParserUtils.java
removed old PhoneGap plugin
removed old example HTML that remained after merge
updated Android Support library to rev 9
Merge branch 'fix-epi-mode'
Update README.md

Copied documentation from the redmine repository and updated the documentation on how to import using GIT.
Merge branch 'testing'
Merge branch 'unstable'
Updated Doxyfile to put output in html/
Merge branch 'master' into unstable