tried to fix editing
Merge branch 'devel' of github.com:ohtu2014-halme/ilmoprojekti into devel