added more display logic to event detail
Merge branch 'master' of https://github.com/edPUG/website, fixed conflict