更新自伺服器121013@cht
後台布料表單圖片的基本路徑
後台布料表單加上簡短說明欄位
config of local.eng
更新自伺服器121013@local.eng
Merge branch 'local.eng' into local.cht

Conflicts:
	conf/config.inc.php
config of cht
布料新版切版
Merge branch 'local.eng' into local.cht
寫入布料簡短說明
update design2 from server
Merge branch 'local.eng' into local.cht
前台布料的新排列樣式
Merge branch 'local.cht' into cht