Added mapeditor, solved conflicts