Merge origin/master

Conflicts:
	src/Networking/Client.java