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