Fixed conflicts

Todo: merge servlets and backend, start developing test websites