Merge pull request #1 from MarkInvince/mark

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

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

Conflicts:
	theme/modules/quotes/quotes.php
new commit
new commit
new commit
new commit
new commit
new commit
new commit
new commit
new commit
new commit
new commit
new commit
new commit
new commit
new commit
new commit
new commit