update from server
fix confilict
Merge branch 'master' of github.com:whitefoxx/wx
Merge branch 'master' of github.com:whitefoxx/wx
add weixin_code for load more