Merge branch 'feature/stroski-prehrane' into develop

Nova funkcija, ki belezi stroske prehrane, ki vplivajo na samo poslovanje.

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.