stuff
Mal gucken
adasd
asd
Merge branch 'master' of https://github.com/abajorat/ARPControll

Conflicts:
	ARP_Kai/bin/Main.class
	ARP_Kai/bin/Operator.class
	ARP_Kai/bin/models/Device.class
	ARP_Kai/bin/models/Model.class
	ARP_Kai/bin/views/Test.class
	ARP_Kai/src/models/Device.java