iu
Merge branch 'master' of https://github.com/fancystudio/vlasy

Conflicts:
	config/xml/default_country_modules_list.xml
	config/xml/must_have_modules_list.xml
konflitk