Testi
Merge branch 'master' of https://github.com/TomiToivio/resourcespace-finnish

Conflicts:
	fi.php