- new stuff
Merge branch 'master' of local repository into Haim

Conflicts:
	OCSF/src/ocsf/server/MySqlConnection.java
-update cancel order
Merge remote-tracking branch 'origin/Haim'

Conflicts:
	OCSF/bin/ocsf/server/MySqlConnection.class
	OCSF/bin/serverGui/Main_Frame$3.class
	OCSF/bin/serverGui/Main_Frame.class
	OCSF/dbInfo.txt
	OCSF/src/ocsf/server/MySqlConnection.java
	OCSF/src/ocsf/server/MySqlConnection.java.orig
	vcproject/bin/controler/LogIn_controller.class
	vcproject/bin/gui/LogIn_Frame.class
	vcproject/bin/gui/Order_Panel$1.class
	vcproject/bin/gui/Order_Panel$2.class
	vcproject/bin/gui/Order_Panel$3.class
	vcproject/bin/gui/Order_Panel.class
	vcproject/bin/gui/VCP_Main_Frame$1.class
	vcproject/bin/gui/VCP_Main_Frame$10.class
	vcproject/bin/gui/VCP_Main_Frame$2$1.class
	vcproject/bin/gui/VCP_Main_Frame$2$2.class
	vcproject/bin/gui/VCP_Main_Frame$2$3.class
	vcproject/bin/gui/VCP_Main_Frame$2.class
	vcproject/bin/gui/VCP_Main_Frame$3.class
	vcproject/bin/gui/VCP_Main_Frame$4.class
	vcproject/bin/gui/VCP_Main_Frame$5$1.class
	vcproject/bin/gui/VCP_Main_Frame$5.class
	vcproject/bin/gui/VCP_Main_Frame$6.class
	vcproject/bin/gui/VCP_Main_Frame$7.class
	vcproject/bin/gui/VCP_Main_Frame$8$1.class
	vcproject/bin/gui/VCP_Main_Frame$8.class
	vcproject/bin/gui/VCP_Main_Frame$9$1.class
	vcproject/bin/gui/VCP_Main_Frame$9.class
	vcproject/bin/gui/VCP_Main_Frame.class
	vcproject/src/controler/PricingController.java
	vcproject/src/controler/VcpInfo.java