Merge origin/master

Conflicts:
	connectFour/entity/AbstractNetworkPlayer.java
	connectFour/entity/ClientNetworkPlayer.java
	connectFour/entity/ServerNetworkPlayer.java