update order ui
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/UI/OrderUI.class
	src/UI/OrderUI.java