fixed navigation
Merge branch 'develop' of github.com:sulu-cmf/sulu-standard into feature/template-grid

Conflicts:
	app/admin/config/config.yml
Merge branch 'feature/template-grid' of github.com:sulu-cmf/sulu-standard into feature/media-selection-template

Conflicts:
	app/admin/config/config.yml