update from server@cht.local
產品屬性欄位可進行排序
調整產品特性的排序值
Merge branch 'tmp' into cht

Conflicts:
	css/cms-index.css
	css/common.css
	images/products-show-li2.jpg
update from server@cht
Merge branch 'cht.local' into cht