Removed order errors
Merge branch 'master' into darren

Conflicts:
	src/OrderGUI.java
Simple Order forms finally implemented in main
Order GUI changes
Added Order GUI to MVC layout