sync android with gae (untested)
Merge branch 'master' of https://github.com/GoogleJump/Caterpillar