Merge pull request #64 from KevinHuebner/master

Fixed mapping in guest-servlet
Merge pull request #13 from cbos-team/master

fix mapping in guest-servlet
make navigation consistent
Merge pull request #65 from dupps/master

make navigation consitent
Merge pull request #16 from cbos-team/master

make navigation consistent