kdlfk`
Merge branch 'master' into mark

Conflicts:
	theme/modules/quotes/controllers/front/QuotesCart.php
Merge pull request #22 from MarkInvince/mark

Mark