k
j
Merge branch 'master' of https://github.com/JERRYCCC/Event

Conflicts:

ClubHub.xcodeproj/project.xcworkspace/xcuserdata/jerry.xcuserdatad/UserI
nterfaceState.xcuserstate
	Event.xcodeproj/project.xcworkspace/xcshareddata/ClubHub.xccheckout