config of local.eng
更新自伺服器121013@local.eng
Merge branch 'local.eng' into local.jap

Conflicts:
	conf/config.inc.php
config of jap
布料新版切版
update design2 from server
後台布料表單圖片的基本路徑
後台布料表單加上簡短說明欄位
寫入布料簡短說明
前台布料的新排列樣式

Conflicts:
	css/cms-index.css
	templates/ws-products-detail1-tpl.html
後台用程式抓布料說明列出項目
Merge branch 'local.eng' into local.jap

Conflicts:
	css/cms-index.css
	templates/ws-products-detail1-tpl.html
Merge branch 'local.jap' into jap