Updated server to have end_time
Merge branch 'master' of https://github.com/bzmwillemsen/Vidersion