Merge branch 'master' of https://gitlab.labranet.jamk.fi/ttow0130-service-oriented-applications/backend