made small changes in gui; added content navigation
fixed merge conflicts
Merge pull request #27 from sulu-cmf/feature/gui-adaptions

made small changes in gui; added content navigation