Impl
Merge branch 'master' of https://github.com/BauerMitFackel/pbf.git

Conflicts:
	pbf-android/src/de/pbf/activity/SensorGraphActivity.java
	pbf-android/src/de/pbf/controller/GraphViewController.java