Fixed get_event error
Conflict stuffs
Merge branch 'master' of https://github.com/rgerd/PTPA-Website