Fix issue asana
Merge remote-tracking branch 'origin/master'

Conflicts:
	user_account/customer/catalogue/qry_catalogue.php
	user_account/customer/templates/default/dsp_catalogue.tpl
Merge remote-tracking branch 'origin/master'
Rep
Merge remote-tracking branch 'origin/master'

Conflicts:
	user_account/customer/catalogue/qry_catalogue.php