Rekisteri.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	xml/rekisteri.xml
	xml/settings.xml