- order cancel GUI added
Merge remote-tracking branch 'origin/Haim' into gal1

Conflicts:
	src/gui/VCP_Main_Frame.java