Fixed the events display to show times properly
Merge branch 'master' into lefilasoi