Validoinnin korjaus
Merge branch 'tiimi6' of https://github.com/ciiqq/Halli into tiimi6

Conflicts:

	Halli/target/m2e-wtp/web-resources/META-INF/maven/fi.softala/koulutusjarjestelma/pom.properties