Conflict fix
Merge branch 'tiimi5' of https://github.com/ciiqq/Halli into tiimi5

Conflicts:
	Halli/src/main/java/fi/softala/controller/KoulutusController.java
Merge branch 'tiimi5' of https://github.com/ciiqq/Halli into tiimi5