-fix db
-add ocsf for client side
-V2
-LogIn controller-Elapsed time for LogIn window 
-Reminder
lkllklkl
Merge remote-tracking branch 'origin/master' into gal
dsffsd
-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/gal'
Merge remote-tracking branch 'origin/Ofer'
Merge remote-tracking branch 'origin/master' into gal
-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
sdsssd
Merge remote-tracking branch 'origin/gal'
Merge branch 'master' of https://github.com/VCPoject/VCPServer.git
kjkjkj
-update server gui