hotkey fix

Changed hotkeys of shifting views to control left and control right
bugfixing parser

11.30 parses properly now
Merge remote-tracking branch 'origin/master' into yongkai