Я поміняв щось там
Я поміняв щось там 2
2, 6, 8 пункти меню ТЗ
Merge pull request #1 from kvARTa/dev

changes on monday
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
changes

	deleted:    README.md
	deleted:    catalog/view/theme/default/stylesheet/stylesheet.css_0703
	deleted:    catalog/view/theme/default/stylesheet/stylesheet.css_1203
	deleted:    catalog/view/theme/default/stylesheet/stylesheet.css_1309
	deleted:    catalog/view/theme/default/stylesheet/stylesheet.css_1809
	deleted:    catalog/view/theme/default/stylesheet/stylesheet.css_3009
	deleted:    catalog/view/theme/default/stylesheet/stylesheet.css_old
	deleted:    catalog/view/theme/default/template/checkout/cart.tpl_0703
	deleted:    catalog/view/theme/default/template/common/footer.tpl_0703
	deleted:    catalog/view/theme/default/template/common/footer.tpl_1309
	deleted:    catalog/view/theme/default/template/common/footer.tpl_old
	deleted:    catalog/view/theme/default/template/product/latest.tpl_13_09
	deleted:    catalog/view/theme/default/template/product/latest.tpl_1509
	deleted:    catalog/view/theme/default/template/product/latest.tpl_old
Merge pull request #3 from kvARTa/prod

changes
	deleted:    README.md
Merge branch 'master' of https://github.com/kvARTa/karbuk
add Batch Editor files
sdfsdffsdf
test
fix style css
fix style css
fix style css
add Batch Editor files
Merge branch 'master' of https://github.com/kvARTa/karbuk into dev

Conflicts:
	.htaccess
	index.php
fix style css