before merge
Merge branch 'master' into mark2

Conflicts:
	theme/modules/quotes/quotes.php
	theme/modules/quotes/views/templates/hook/product-list.tpl
merge master
Merge pull request #37 from MarkInvince/mark2

Mark2