Merge branch 'master' of http://192.168.0.115:3000/chenzhiguang/wechatIM

# Conflicts:
#	server/fashilong.js