Merge branch 'alinasava/web-dev-a' into 'master' Makerlog grew ;) See merge request makerlog/web!27