add weixin support, and fix merge bug
Merge branch 'master' of https://github.com/catsky/rebang