implemented edit activity in event instance
completed edit award
Merge remote-tracking branch 'origin/master'