Merge remote-tracking branch 'origin/master'

Conflicts:
	.classpath
	bin/.gitignore
	res/net.properties
	src/network/NetworkSettings.java
	src/network/client/TestClient.java