Fixed SplashScreen
Fixed SplashScreen
Changed activity_offer_in_progress.xml
Touched up activity_offer.xml
User can now change expiry date
Touched up EditProfileGUI
Merge pull request #10 from irislyng/master

Fixed SplashScreen
Merge branch 'master' of https://github.com/chin-andrew/CabPool into andrew

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