added pop support
Merge branch 'new'

Conflicts:

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