jhjhjjhjh
Merge remote-tracking branch 'origin/master' into gal

Conflicts:
	vcproject/src/clientServer/ClientConsole.java
	vcproject/src/controler/LogIn_controller.java
Merge branch 'master' of https://github.com/VCPoject/VCPServer.git

Conflicts:
	vcproject/src/controler/LogIn_controller.java