BACKLOG-4593 : add event views and content template
Merge remote-tracking branch 'origin/master'