Android improvements
Merge branch 'master' of https://github.com/spaceappchile/team16