Fixed bugs
Merge branch 'master' of https://github.com/KevinHuebner/cbos
Fixed mapping in guest-servlet