Added QR result parsing to OfferCabGUI, RequestCabGUI
Merge branch 'master' of https://github.com/chin-andrew/CabPool

Conflicts:
	bin/classes/com/a04/cabpool/OfferCabGUI.class
	bin/classes/com/a04/cabpool/RequestCabGUI$1.class
	bin/classes/com/a04/cabpool/RequestCabGUI.class
	project.properties
	src/com/a04/cabpool/RequestCabGUI.java
Fixed QR code crash
fixed QR code
Merge branch 'master' of https://github.com/changj23/CabPool

Conflicts:
	src/com/a04/cabpool/OfferCabGUI.java
	src/com/a04/cabpool/RequestCabGUI.java