fix title/content in wrong position
Merge branch 'master' into rename-config-strategy
strategies to configuration
Merge branch 'master' into doc-properties-to-seo-metadata

Conflicts:
	EventListener/SeoContentListener.php
	Model/SeoMetadata.php
	Model/SeoPresentationInterface.php
Merge branch 'doc-properties-to-seo-metadata' into doc-properties-to-seo-metadata-upstream

Conflicts:
	Resources/config/services.xml