Merge branch 'master' into personal/kob2

Conflicts:
	app/config/database.php
	app/models/Product.php
	app/models/ProductImg.php
	app/views/webHead.php
แก้ไขการอัฟภาพและแก้ข้อมูล product
db
Merge branch 'master' into personal/kob2

Conflicts:
	app/models/Product.php
	app/models/ProductImg.php
	app/routes.php
	app/views/webHead.php
แก้ไข
Merge branch 'personal/kob2' of https://github.com/test1124323/mx1shop into personal/kob2
db