parcom
Merge remote-tracking branch 'refs/remotes/origin/master'

Conflicts:
	catalog/view/theme/theme032/stylesheet/stylesheet.css