update market
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/modules/market/views/product.php