Mockup changes
Merge branch 'master' of https://github.com/ohtu2014-halme/ilmoprojekti