Grid layouts
Merge branch 'devel' of https://github.com/otavanopisto/muikku.git into devel