Merge pull request #46 from frkarl/develop

[MapEditor] Updates of the map editor