Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

# Conflicts:
#	watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/index.html