added option for showing masterController in portrait orientation
added iOS 6 compatibility sacrificing the UIScreenEdgePanGesture support for iOS 6
Merge branch 'ios6compatibility'