update
Merge branch 'master' of https://github.com/HeinrichHartmann/MobileSensing

Conflicts:
	SensorApp/src/eu/livegov/mobilesensing/MainActivity.java