Updating
Merge branch 'master' of https://github.com/Royathe/Luontoloikka

Conflicts:
	Luontoloikka/Luontoloikka.userprefs
commiting pull
test