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

Conflicts:
	templates/airstrikeBravoPortrait/js/airstrikeBravoPortraitViews.js