event all addeed
Merge pull request #116 from sunnyLA4/master

event all addeed
new changes made in events
index conflicts removed