Merge remote-tracking branch 'origin/Business_objects' into gui2
Merge branch 'Business_objects' into gui2
pridano prihlaseni
Merge branch 'gui2' of github.com:usi-skladovy-system/a7b36usi-skladovy-system

Conflicts:
	source/src/main/java/cz/a7b36usi/sklad/App.java