Major edit
Merge branch 'backend' of https://github.com/ehannes/webapp.git into backend