Update events view
Update events view
Merge branch 'master' of https://github.com/imatem/matem.event
Merge gils changes