banner
Merge branch 'master' of https://github.com/webcainternet/case4you2

Conflicts:
	public/catalog/view/theme/theme254/template/module/slideshow.tpl