add by jonsan 20131004
rollback by jonsan
Revert "rollback by jonsan"

This reverts commit 7544125d24315b99b5fc6a0a2dc4cd188314bb57.
Merge branch 'master' of https://github.com/guojiangshan/wechat