news列表篩選條件串連分類table

Conflicts:
	news.php
Merge branch 'master2' into newtinymce