Merge origin/master

Conflicts:
	src/nettytest/NettyTest.java