cleaning up templates for events
Merge remote-tracking branch 'origin/development' into development