-Employee Panel has been attached.
Merge remote-tracking branch 'origin/gal'

Conflicts:
	vcproject/src/gui/Employee_Panel.java
	vcproject/src/gui/VCP_Main_Frame.java
asas
-update CompainController
- update complain and complainFu
Merge remote-tracking branch 'origin/Haim'
- update
-entities package.
lsdklsdk
Merge branch 'master' of https://github.com/VCPoject/VCPServer

Conflicts:
	vcproject/src/gui/VCP_Main_Frame.java
Merge remote-tracking branch 'origin/Ofer'

Conflicts:
	OCSF/src/ocsf/server/MySqlConnection.java
	vcproject/src/controler/LogIn_controller.java
	vcproject/src/gui/VCP_Main_Frame.java