Merge pull request #16 from cbos-team/master

make navigation consistent
Fixed bugs
Merge pull request #66 from KevinHuebner/master

Fixed mapping at login.jsp