Merge pull request #35 from MarkInvince/mark2

Mark2
last update module
last update module
last update module
last update module
last update module
last update module
last update module
last update module
last update module
last update module
last update module
before merge
Merge pull request #36 from MarkInvince/romik14

Romik14
Merge branch 'master' into mark2

Conflicts:
	theme/modules/quotes/quotes.php
	theme/modules/quotes/views/templates/hook/product-list.tpl
merge master