fixed edit event bugs and refined event view
Merge branch 'master' into afro