Merge branch 'backend' of https://github.com/ehannes/webapp.git
Merge branch 'master' of https://github.com/ehannes/webapp.git
Merge branch 'master' of https://github.com/ehannes/webapp
Changed so that the server won't crash when testing