Improved the edit order view and other things
changes
Merge branch 'master' of https://github.com/BBackerry/SOEN387

Conflicts:
	src/controller/EditOrder.java