new branch
Merge branch 'chaim_branch' of https://github.com/soomla/storefront into chaim_branch

Conflicts:
	src/js/views/helper-views.js