Minor changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/classes/com/goofy/travelbuddy/SplashScreenActivity.class