lel
Merge branch 'master' of https://github.com/ascone/ZigBeeServer.git
Merge branch 'master' of https://github.com/ascone/ZigBeeServer.git

Conflicts:
	ZigBeeServer/src/test.java