Merge branch 'android'
Merge branch 'master' of https://github.com/steven989/coffeengo