Merge branch 'master-new'

Conflicts:
	weixinPlatform/src/com/weixin/datacore/service/weixin/impl/WeixinArticlesSrvImpl.java