Merge with working android copy
Merge branch 'master' into just
fix gitignore