Added time until next edpug helper, added helper to the view
Merge branch 'master' of https://github.com/edPUG/website