GUI
Merge branch 'master' of https://github.com/sirlordrouter/ch.btx8202.lc2.supplychain

Conflicts:
	Client/.idea/workspace.xml