fix title/content in wrong position
Merge branch 'master' into rename-config-strategy
Merge branch 'master' into xsd-file-for-xml-mapping
Merge remote-tracking branch 'upstream/xsd-file-for-xml-mapping' into xsd-file-for-xml-mapping
config changes in the xsd