eCommerce Product Catalog 1.8.6

eCommerce Product Catalog 1.8.6
Merge remote-tracking branch 'origin/master'

Conflicts:
	functions/content-functions.php