Fixes to move functionality from view to controller
Merge branch 'devel' of github.com:Meta-arviointi/meta-arviointi into devel