131012-2204
Merge branch 'philippschumann' of https://github.com/philippschumann/DroidTapper into philippschumann