nix
Merge branch 'master' of https://github.com/PlcCollector/PLCRepo

Conflicts:
	Frontend/Graphic.xaml.cs