-add ocsf for client side
Merge remote-tracking branch 'origin/gal'
Merge remote-tracking branch 'origin/Ofer'
-add server
-fix db connector problem
Merge remote-tracking branch 'origin/Ofer'

Conflicts:
	OCSF/.classpath
	OCSF/bin/ocsf/server/EchoServer.class
	OCSF/src/ocsf/server/MySqlConnection.java
Merge remote-tracking branch 'origin/gal'
Merge branch 'master' of https://github.com/VCPoject/VCPServer.git
kjkjkj
Zaxzxzx