update
Merge branch 'master' of https://github.com/shked0wn/Jserveur

Conflicts:
	src/com/jservmarket/controler/Jclient.java