a
Merge branch 'master' of https://github.com/abajorat/ARPControll.git

Conflicts:
	ARP_Kai/bin/Operator.class
	ARP_Kai/bin/arp/StatusController.class
as
Merge branch 'master' of https://github.com/abajorat/ARPControll.git

Conflicts:
	ARP_Kai/bin/arp/StatusController.class