pic
query cate
view product
img
cate
connection
before upload
4.1 update without delete vendor
down 4.1 framwork
Merge branch 'master' into personal/kob2

Conflicts:
	app/config/database.php
	app/models/Product.php
	app/models/ProductImg.php
	app/views/webHead.php