Merge remote-tracking branch 'origin/master'

Conflicts:
	application/libraries/product/admin/product.php
	application/views/admin/product/add_product.php
	application/views/admin/product/update_product.php
Merge remote-tracking branch 'origin/master'