before marge
Merge branch 'master' into mark

Conflicts:
	theme/config/xml/default_country_modules_list.xml
	theme/config/xml/modules_native_addons.xml
	theme/config/xml/must_have_modules_list.xml
	theme/modules/gamification/data/data_RU_UAH_UA.json
	theme/modules/quotes/controllers/front/QuotesCart.php
Merge pull request #6 from MarkInvince/mark

Mark