Merge remote-tracking branch 'eoecn/master'
Merge branch 'master' of https://github.com/feicien/android-app