Android Guide: Update.
Merge branch 'master' of github.com:appacitive/appacitive.github.com