updated ContentNavigation
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into feature/content-navigation-refactoring
corrected response of NavigationController
Merge pull request #203 from sulu-cmf/hotfix/content-settings

Hotfix/content settings
Update composer.json
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into hotfix/localized-template-title

Conflicts:
	composer.json
Merge pull request #204 from sulu-cmf/hotfix/localized-template-title

Hotfix/localized template title
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into feature/content-navigation-refactoring

Conflicts:
	Admin/SuluContentContentNavigation.php
Merge branch 'master' of git://github.com/sulu-cmf/SuluContentBundle into develop

Conflicts:
	composer.json
Merge pull request #207 from sulu-cmf/hotfix/smart-content-tag-filter

[Hotfix] Fixed tag filter for smart content
Merge branch 'master' of git://github.com/sulu-cmf/SuluContentBundle into develop

Conflicts:
	composer.json
Merge branch 'master' of git://github.com/sulu-cmf/SuluContentBundle into develop
SmartContent implements pager
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
Merge branch 'master' into develop

Conflicts:
	composer.json
enhancements
Merge branch 'feature/ckeditor-enhancements' into develop
Merge branch 'develop' into feature/smart-content-pagination-2

Conflicts:
	Content/Types/SmartContent.php
updated content types