Add gray color to list
Add gray color
Merge remote-tracking branch 'origin/master'

Conflicts:
	SportJoin.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate