adaptions to my needs
Merge branch 'master' of github.com:ReSqAr/otr-verwaltung