Finished mapeditor
Pull commit