Merge pull request from brainless/develop Integration of webapp and backend/API