1
Merge branch 'master' of https://github.com/callzhang/Custom-Transition-Animation-GPUImage-

Conflicts:

NavigationTransitionController.xcodeproj/project.xcworkspace/xcuserdata/
Lee.xcuserdatad/UserInterfaceState.xcuserstate