Fixed conflicts and made new classes work with old
Merge branch 'master' of https://github.com/markus-git/webapp.git