oboi
Merge remote-tracking branch 'origin/master'

Conflicts:
	catalog/view/theme/default/image/banner/banner.jpg