commit
Merge branch 'master' of https://github.com/SanLiangSan/TVGAnimation

Conflicts:
	TVGAnimation/TVGAnimation.xcodeproj/project.pbxproj
	TVGAnimation/TVGAnimation.xcodeproj/project.xcworkspace/xcshareddata/TVGAnimation.xccheckout
	TVGAnimation/TVGAnimation/TVGKeyFrame_VC.m