quite some refactoring
Merge branch 'master' of https://github.com/MahatmaX/flowerpower4android.git