surprise commit
Merge branch 'master' of github.com:LeonardDrs/lcdb

Conflicts:
	config/xml/default_country_modules_list.xml