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
Merge pull request #13 from irislyng/master

Changed the UI