more android classes and tests
Merge branch 'master' of https://github.com/Panum/sw804f13