vi+同步代码
Merge branch 'master' of https://github.com/Vienta/SSAnimation

Conflicts:

SSAnimation/SSAnimation.xcodeproj/project.xcworkspace/xcuserdata/vienta.
xcuserdatad/UserInterfaceState.xcuserstate
	SSAnimation/SSAnimation/SSAction/SSAction.h
	SSAnimation/SSAnimation/SSAction/SSAction.m