android prject weirdness
Merge branch 'master' into FlyTrap