working copy commit
Merge branch 'jeremy' into tom
Merge branch 'jeremy' into tom
working events table cell without reload after creating event