Added map display to editor.
Merge branch 'feature/mapeditor' into dev