juuh
commit
Merge branch 'tiimi5' of https://github.com/ciiqq/Halli into tiimi5

Conflicts:
	Halli/src/main/java/fi/softala/controller/Controller1.java
	Halli/target/m2e-wtp/web-resources/META-INF/maven/fi.softala/koulutusjarjestelma/pom.properties
Merge branch 'tiimi5' of https://github.com/ciiqq/Halli into tiimi5

Conflicts:
	Halli/src/main/java/fi/softala/controller/Controller1.java
	Halli/target/m2e-wtp/web-resources/META-INF/maven/fi.softala/koulutusjarjestelma/pom.properties