update from server@eng.local
Merge branch 'eng.local' into eng
update from server@cht.local
上線後的config
news列表加上detail
Merge branch 'eng.local' into eng
取消限制news div的高度
Merge branch 'eng.local' into eng
修改詳細文字
Merge branch 'eng.local' into eng
news列表加上detail

Conflicts:
	lang/eng-utf8.php
中文的詳細文字
調整news列表樣式
Merge branch 'cht.local' into eng.local

Conflicts:
	css/index.css
	lang/eng-utf8.php
	templates/ws-contactus-form-bak-tpl.html
	templates/ws-fn-top-menu-tpl.html
	templates/ws-index-tpl.html
	templates/ws-news-tpl.html
Merge branch 'eng.local' into eng
remove old contact templates
Merge branch 'cht.local' into eng.local

Conflicts:
	templates/ws-contactus-form-bak-tpl.html
Merge branch 'eng.local' into eng