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