before merge
dfjkdf`
Merge branch 'master' into mark

Conflicts:
	theme/modules/quotes/classes/QuotesSubmit.php
	theme/modules/quotes/controllers/front/QuotesCart.php
	theme/translations/ru.gzip
	theme/translations/uk.gzip
Merge branch 'master' into mark

Conflicts:
	theme/modules/quotes/controllers/front/QuotesCart.php
Merge pull request #20 from MarkInvince/mark

Mark