cms styles
srotinki
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/default-bootstrap/product.tpl