news的上下筆連結

Conflicts:
	news.php
news2的上下筆連結
Merge branch 'master2' into newtinymce