-mysql-connector-java-3.1.11-bin.jar
Merge branch 'master' of https://github.com/VCPoject/VCPServer.git
mysql-connector
Merge remote-tracking branch 'origin/Ofer'

Conflicts:
	OCSF/.classpath
	OCSF/bin/ocsf/server/EchoServer.class
	OCSF/src/ocsf/server/MySqlConnection.java
-update server gui: can view number of connection,connected
client,console
-try to commit
-try to fix