add feature model
Merge remote-tracking branch 'origin/master'

Conflicts:
	weichg_cart/public/admin/view/template/catalog/product_list.tpl