updated ContentNavigation
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into feature/content-navigation-refactoring
corrected response of NavigationController
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into feature/content-navigation-refactoring

Conflicts:
	Admin/SuluContentContentNavigation.php
Merge branch 'develop' of https://github.com/sulu-cmf/SuluContentBundle into feature/content-navigation-refactoring
Merge pull request #196 from sulu-cmf/feature/content-navigation-refactoring

[FEATURE] updated ContentNavigation