fix
Merge branch 'hesa-regatta' of https://github.com/tvesalainen/hoski-webapp.git into hesa-regatta
fix