Merge pull request #584 from NicoleRauch/master

Versions-Konflikt-Behandlung beim Speichern einer Activity
Added error message when redirecting to activities/edit