Added "Cab Arrived" button to RequestInProgressGUI; Brings up QR scanner on press
Merge branch 'master' of https://github.com/chin-andrew/CabPool into andrew

Conflicts:
	res/values/strings.xml
Merge branch 'andrew'