event manager first commit
update event manager
Merge branch 'event-manager-dev'