work on cronjob
conflict fix
Merge branch 'master' of https://github.com/IGPython/Calibration-Certification-App