new commit
Merge branch 'master' into romik6
Merge pull request #19 from MarkInvince/romik6

Romik6
Merge branch 'master' into mark

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