Fixed merge conflict
Merge branch 'SpaceOgre-MenuAndGui'