Paivitys
Paivitys
Merge branch 'master' of github.com:aalri/OhHa-ToTGen

Conflicts:
	ToTGen/target/test-classes/totgen/domain/AppTest.class