Fixed edit events page

refs #175
Merge branch 'master' into production