Product show overrides
Merge branch 'master' of https://github.com/paulgroves/spree-foundation-theme

Conflicts:
	config/locales/en.yml