commit_11_02
Merge branch 'master' of https://github.com/annakeren/EventsManager