Implemented events (not completed)
Implemented events (completed)
Completed events 2
Merge branch 'master' into alcros-dev