Cox basic functions should work
Merge branch 'master' of https://github.com/bennyty/speedGIT.git

Conflicts:
	SpeedCoach/src/com/lehmannsystems/speedcoach/CoachActivity.java