l
Merge branch 'master' of https://github.com/JERRYCCC/JCClubHub

Conflicts:
	ClubHub.xcodeproj/project.xcworkspace/xcshareddata/ClubHub.xccheckout
k