Merge branch 'develop' into '81-create-events-latest-template-for-start-page'

# Conflicts:
#   html/typo3conf/ext/t3org_layout/Configuration/TypoScript/Default/constants.txt

html/typo3conf/ext/t3org_layout/Configuration/TypoScript/Default/constants.txt

@@ -16,5 +16,8 @@ plugin.tx_certifications.persistence.storagePid = 212
 plugin.tx_t3omembership.persistence.storagePid = 227
 plugin.tx_typo3roadmap.persistence.storagePid = 228
 
-# Events
+# Events settings
 plugin.tx_sfeventmgt.settings.detailPid = 230
+
+# News Settings
+plugin.tx_news.settings.detailPid = 185