Fix 2 window on game view
Merge remote-tracking branch 'origin/master'