Fixed google maps crash bug
Added birthday to EditProfileGUI
Merge branch 'EditProfileGUI'

Conflicts:
	res/layout/activity_edit_profile.xml
	res/values/strings.xml
Fixed merge errors
Merge test
Added scrollview and destination to offerGUI
Enhanced gps conncetion reliability in mapsActivity
Implemented destination search
Merged with upstream
Added strings
Fixed QR Scanner crash on 'back'; tidied up
Merge pull request #12 from chin-andrew/master

Fixed QR Scanner crash on 'back'; tidied up
Merge branch 'master' of https://github.com/changj23/CabPool
Fixed errors with expiry date
Merge branch 'EditProfileGUI'
Setup activity_list_offers.xml
Set up activity_request.xml
Changed background colour of app
Made major UI changes
Fixed UI error messages