Added John's xml file
Fixed XML errors
Merge remote-tracking branch 'origin/master' into first-time-setup-feature

Conflicts:
	SpeedCoach/bin/R.txt
	SpeedCoach/bin/SpeedCoach.apk
	SpeedCoach/bin/classes.dex
	SpeedCoach/bin/resources.ap_