prod monday changes
Merge remote-tracking branch 'origin/prod'

Conflicts:
	catalog/controller/checkout/cartCsv.php
	catalog/controller/checkout/cartcsv.php
	catalog/model/cartcsv/csv.php
	catalog/view/javascript/coomon---.js
	image/counter.png
	tmp/.gitignore
some changes controller