-V2
Merge branch 'master' of https://github.com/VCPoject/VCPServer

Conflicts:
	vcproject/bin/.gitignore
-add abstract Controller for extend every controller
the abstract know to do every thing

- some uptream code for server
Merge remote-tracking branch 'origin/Ofer'

Conflicts:
	OCSF/bin/ocsf/server/EchoServer.class
	OCSF/bin/ocsf/server/MySqlConnection.class
	OCSF/src/ocsf/server/MySqlConnection.java
Merge branch 'master' of https://github.com/VCPoject/VCPServer.git

Conflicts:
	vcproject/src/controler/LogIn_controller.java
Merge remote-tracking branch 'origin/gal'

Conflicts:
	vcproject/src/controler/LogIn_controller.java
	vcproject/src/gui/VCP_Main_Frame.java
-Employee Panel has been attached.