conf
Merge branch 'gui2' of github.com:usi-skladovy-system/a7b36usi-skladovy-system

Conflicts:
	source/src/main/java/cz/a7b36usi/sklad/App.java
Controller test
Merge branch 'master' into gui2

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