產品特別分類機制

Conflicts:
	cmsadmin/products.php

Conflicts:
	cmsadmin/products.php
	conf/default-items.php
	lang/cht-utf8.php
	lang/eng-utf8.php
Merge branch 'master2' into newtinymce