Changed client settings
Merge branch 'master' of https://github.com/jloures/John_Vivien

Conflicts:
	OrbisChallengeDevKit-Java/logs/human.java.log
	logs/AI-java.log
	nbproject/project.properties