included navigation of webspaces from portal bundle
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into develop
updated navigation to replace portalbundle
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into develop
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into feature/resource-locator-component