Merge pull request #20 from MarkInvince/mark

Mark
new commit
Merge pull request #21 from MarkInvince/romik8

new commit
Merge branch 'master' into mark

Conflicts:
	theme/modules/quotes/controllers/front/QuotesCart.php