Merge branch 'develop' into '113-remove-all-events-linkin-event-list'
# Conflicts: # html/typo3conf/RealurlConfiguration.php # html/typo3conf/ext/t3org_layout/Resources/Private/Extensions/SfEventMgt/Templates/Event/List.html
# Conflicts: # html/typo3conf/RealurlConfiguration.php # html/typo3conf/ext/t3org_layout/Resources/Private/Extensions/SfEventMgt/Templates/Event/List.html