test ediatble
Merge branch 'master' of https://github.com/yanovitchsky/visibleo_theme_ecommerce_3

Conflicts:
	app/views/pages/index.liquid