corrected segue to modal from push (needed for Xcode beta 2)
Merge remote-tracking branch 'origin/master'