Fix JoinSports
Merge branch 'master' of github.com:Draveness/SportJoin

Conflicts:
	SportJoin/STKDetailViewController.m