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 pull request #2 from MarkInvince/romik

Romik
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
remove log
Merge branch 'master' of https://github.com/MarkInvince/presta_ob
Merge branch 'master' into mark

Conflicts:
	theme/config/xml/blog-ru.xml
	theme/config/xml/default_country_modules_list.xml
	theme/config/xml/modules_native_addons.xml
	theme/config/xml/must_have_modules_list.xml
Merge pull request #4 from MarkInvince/mark

Mark
test
test