added show to event controller
Merge branch 'work_branch'