Fixed
Merge branch 'refs/heads/feature-image-click-through' into develop
fixed
Merge branch 'refs/heads/feature-menu-categories-sorting' into develop
Merge branch 'refs/heads/hotfix-hideprice' into develop
Some non related fixes
Added
Merge branch 'refs/heads/feature-brand-catalogs' into develop
try for IE
fixed
Merge branch 'refs/heads/hotfix-ie'

Conflicts:
	catalog/static/scripts/main_c.js
Merge branch 'refs/heads/hotfix-ie' into develop
Merge branch 'refs/heads/release-1.0.4'