Merge branch 'hotfix-2.1.4'
Attributes won't show two links to the same event anymore on the event view
Merge branch 'hotfix-2.1.5' into develop