news獨立類別及其應用程式

Conflicts:
	conf/default-items.php
Merge branch 'master2' into newtinymce