order changes
Merge branch 'master' of https://github.com/BBackerry/SOEN387

Conflicts:
	WebContent/CheckOutBillAddress.jsp
changes to order