merge
Merge branch 'master' of https://github.com/SchmidtSebastien/Coach

Conflicts:
	Coach/Coach.xcodeproj/project.pbxproj
Menu Coach - Athlete