New Code,
Merge remote-tracking branch 'origin/master'

Conflicts:
	user_account/customer/templates/default/dsp_catalogue.tpl