Merge branch 'master' of github.com:usi-skladovy-system/a7b36usi-skladovy-system into Business_objects
Merge remote-tracking branch 'origin/Business_objects' into gui