some minor change
Merge remote-tracking branch 'origin/master'

Conflicts:
	news.js
	portal.js