Wääh
Merge branch 'devel' of https://github.com/ohtu2014-halme/ilmoprojekti into devel