MyUpdate ian
Merge branch 'master' of https://github.com/harley-cleverlocal/heart2shine
Ian's after 400px
Merge branch 'master' of https://github.com/harley-cleverlocal/heart2shine
12-10-14
Merge branch 'master' of https://github.com/harley-cleverlocal/heart2shine

Conflicts:
	Panels/A_CustomerTestimonials.html
	Panels/A_ProductReviewList.html
	Panels/Footer.html
	Panels/Header.html
	Panels/PurchaseGiftCertificate.html
	Panels/_CustomShop.html
	Panels/_GiftCertificateSection.html
	Snippets/CategoryProductsItem.html
	cart.html
12-10-14__02
12-10-14__3

third commit of the day….
Merge branch 'master' of https://github.com/harley-cleverlocal/heart2shine

Conflicts:
	Panels/A_CustomerTestimonials.html
	Panels/A_ProductReviewList.html
	Panels/Footer.html
	Panels/Header.html
	Panels/PurchaseGiftCertificate.html
	Panels/_CustomShop.html
	Panels/_GiftCertificateSection.html
	Snippets/CategoryProductsItem.html
	cart.html