Merge origin/master

Conflicts:
	application/modules/product/controllers/product.php
	application/modules/product/views/form_product_information_edit.php
	application/modules/product/views/form_trade_info_edit.php
	asset/mediacenter/js/scripts.js