Merge branches 'mark' and 'romik' of https://github.com/MarkInvince/presta_ob into mark
conflict
Merge branches 'mark' and 'romik' of https://github.com/MarkInvince/presta_ob into mark

Conflicts:
	theme/modules/quotes/quotes.php
Merge branches 'mark' and 'romik' of https://github.com/MarkInvince/presta_ob into mark

Conflicts:
	theme/modules/quotes/quotes.php
Merge branches 'mark' and 'romik' of https://github.com/MarkInvince/presta_ob into mark
Merge branches 'mark' and 'romik' of https://github.com/MarkInvince/presta_ob into mark

Conflicts:
	theme/modules/quotes/quotes.php
Merge branches 'mark' and 'romik' of https://github.com/MarkInvince/presta_ob into mark

Conflicts:
	theme/modules/quotes/quotes.php
before merge
Merge branch 'master' into mark

Conflicts:
	theme/modules/quotes/controllers/front/QuotesCart.php
	theme/translations/ru.gzip
	theme/translations/uk.gzip
resolve conflict
Merge pull request #3 from MarkInvince/mark

Mark first merge