configuration du client tcp
Merge branch 'master' of ssh://git@github.com/H4313/server.git

Conflicts:
	server/src/com/h4313/deephouse/server/main/Main.java
	server/src/com/h4313/deephouse/server/util/Tool.java