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

Conflicts:
	theme/modules/quotes/quotes.php