Added a nullcheck to the date-to-string method.
Merged some diffs
Merge branch 'master' of https://github.com/hermith/mclak_healthy_catering_project