added date-matching for event editing
Merge branch 'd2'
removed log statements