Android update
Android
fix
Merge branch 'master' of https://github.com/robinvz/TeamC