Cleaned some code.
Merge branch 'master' of https://github.com/markus-git/webapp.git