update from server@cht
update from server@eng.local
Merge branch 'eng.local' into eng
網頁手機版開關

Conflicts:
	conf/config.auth.php
	conf/config.inc.php
	js/ws_main.js
	lang/chs-utf8.php
	lang/cht-utf8.php
	lang/eng-utf8.php
	lang/fre-utf8.php
	lang/ger-utf8.php
	lang/ind-utf8.php
	lang/jap-utf8.php
	lang/kor-utf8.php
	lang/por-utf8.php
	lang/rus-utf8.php
	lang/spa-utf8.php
	lang/tur-utf8.php
	libs/libs-main.php
	libs/libs-sysconfig.php
	templates/ws-fn-common-js-tpl.html
	templates/ws-fn-header-tpl.html
	templates/ws-fn-index-header-tpl.html
	templates/ws-index-tpl.html
啟用手機版及其設定
調整mobile的設定
Merge branch 'eng.local' into eng
重設手機版相關選項
語言列的寬度
調整語言列項目順序
Merge branch 'eng.local' into eng
Merge branch 'eng' into cht

Conflicts:
	css/cms-index.css
	css/index.css
	lang/cht-utf8.php
	templates/ws-fn-all-tpl.html
	templates/ws-index-tpl.html
手機版相關設定(閉)
update from server@chs
Merge branch 'cht' into chs

Conflicts:
	lang/chs-utf8.php
	templates/ws-fn-all-tpl.html
	templates/ws-index-tpl.html
手機版相關設定(關閉)
update from server@spa
Merge branch 'chs' into spa

Conflicts:
	lang/spa-utf8.php
	templates/ws-fn-all-tpl.html
	templates/ws-index-tpl.html
	templates/ws-index-tpl.htmlBAK
手機版相關設定(關閉)