yeay
Merge branch 'master' of https://github.com/farahs/pockettrainer

Conflicts:
	src/com/pockettrainer/TrainingResultActivity.java