fixed error 500 bugs
Merge branch 'master' of https://github.com/kditraglia/Scheduler