Big android app update
Merge branch 'master' of https://github.com/CallanIwan/Aranha