king
Merge branch 'master' of https://github.com/ssnhitfkgd/trunk

Conflicts:
	.DS_Store
	CUTrunk.xcodeproj/project.xcworkspace/xcuserdata/king.xcuserdatad/UserInterfaceState.xcuserstate
kling