merge conflict korjattu
Merge branch 'viherkaton_lisays' of github.com:Askensio/Viherkatto into viherkaton_lisays
viherkaton kontrollerin new tehty