fixing hour + crud
fixing crud
Merge branch 'master' of https://github.com/plansys/Plansys