author weitsai
Merge branch 'master' of https://github.com/cy-project/iHelp-android