add files
Merge branch 'master' of https://github.com/devpilgrin/EditorGui

Conflicts:
	Editor/MapEditor.cs