Fixing problem with UPC catalog links not linking directly to item.
Merge branch 'development' into cc-redesign

Conflicts:
	docroot/sites/all/themes/rcpl/template.php