modifiedd events
resolve events coflicts
removed conflicts
Merge pull request #126 from rishy/master

removed conflict in sunnyLA4-repo