Merge remote-tracking branch 'origin/test'

Conflicts:
	cmp-portal/js/articalModify.js
	e/a.html
	e/r.html
	js/articalModify.js
	js/articalShow.js
	js/common.js
	js/discover.js