commit via eclipse
commit via eclipse 2
Merge branch 'master' of https://github.com/wbjames/weixin.git