Merge origin/master

Conflicts:
	server/src/server/Server.java