Merge branch 'alinasava/web-dev-a' of https://gitlab.com/makerlog/web into alinasava/web-dev-a