change
Merge branch 'master' of https://github.com/eo-org/fucms

Conflicts:
	module/Subsite/view/brick/article/news/view.tpl