back to basic
Merge branch 'master' of https://github.com/VCPoject/vcproject.git

Conflicts:
	src/controler/VCP_Main.java
	src/gui/CancelOrder_Panel.java
-back to basic