tmp
Merge branch 'master' of github.com:ogrebgr/khandroid
conceptually done