tmp
Merge branch 'master' of https://github.com/touletan/HockeyChallenge

Conflicts:
	HockeyChallenge.capx
	HockeyChallenge.capx.autosave