Merge branch 'master' into Adar
events: more progress
events: editing
dashboard: show events
Merge branch 'Adar'
Merge branch 'master' into Eran