Locales
Merge branch 'devel' of https://github.com/koulutuksenpilvivayla/pilvivayla-basaari into devel