update from server@local.cht
Merge branch 'local.cht' into master.cht
new news and new mk_link and layer_link in class mainfunc

Conflicts:
	libs/libs-main.php
設定最新消息的獨立類別

Conflicts:
	cmsadmin/news.php
	cmsadmin/templates/ws-manage-news-cate-form-tpl.html
	news.php
news列表篩選條件串連分類table

Conflicts:
	news.php

Conflicts:
	news.php
移除news裡的重複layer_link
news首頁不指定變數f
旅遊景點
更新後台metatitle
update from server@master.cht
Merge branch 'local.cht' into master.cht
設定旅遊景點的分類id