no message
Merge branch 'master' of https://github.com/pun2345/Dumbobay

# By POOKPICK (2) and Taweekiat Trongwongsa (1)
# Via POOKPICK
* 'master' of https://github.com/pun2345/Dumbobay:
  no message
  no message
  no message

Conflicts:
	application/controllers/product_c.php