Fixed transition
Merge branch 'ios/ios-7' of https://github.com/ZeusWPI/hydra into ios/ios-7