update
Merge branch 'master' of http://github.com/teeple/pc_dev

Conflicts:
	sites/all/modules/product_catalog/util.inc