Added birthday to EditProfileGUI
Merge branch 'EditProfileGUI'

Conflicts:
	res/layout/activity_edit_profile.xml
	res/values/strings.xml
Fixed merge errors
Merge test
Merged with upstream
Added strings
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
Added Hyuna's changes to ForgotPasswordGUI
Fixed RegistrationGUI and added errors to check for during registration
Merge pull request #13 from irislyng/master

Changed the UI
Merge branch 'master' of https://github.com/changj23/CabPool
Merge pull request #14 from irislyng/master

Fixed RegistrationGUI and added errors to check for
Get return info and save to parse from mapsActivity