ladskl`
Merge branch 'master' into mark

Conflicts:
	theme/config/xml/modules_native_addons.xml
	theme/config/xml/must_have_modules_list.xml
	theme/modules/quotes/controllers/admin/AdminQuotesController.php
Merge pull request #24 from MarkInvince/mark

Mark