api change
force button
nix
Merge branch 'service_wifi_scanner' of https://medien.informatik.uni-ulm.de/git/mind_android into service_wifi_scanner
...
merge
merge
Merge branch 'master' of https://medien.informatik.uni-ulm.de/git/mind_android