More small fixes eeeerry where
Merge branch 'master' of https://github.com/hermith/mclak_healthy_catering_project