Updated GUI sale classes to mirror Darrens
commting master
Merge branch 'master' of https://github.com/fcpteam1/project

Conflicts:
	src/GUI/SaleController.java
	src/GUI/SaleFormEvent.java
	src/GUI/SaleFormListener.java
	src/GUI/SaleFormPanel.java
	src/GUI/SaleFormPanel2182014.java
	src/GUI/SaleGui.java
	src/GUI/SaleTextPanel.java
	src/GUI/SaleToolbar.java
	src/model/Shop.java