before merge
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/quotes/controllers/admin/AdminQuotesController.php
	theme/modules/quotes/controllers/front/submitedQuotes.php
	theme/modules/quotes/js/back.js
	theme/modules/quotes/views/templates/admin/quotes_view.tpl
Merge pull request #15 from MarkInvince/mark

Mark