MapEditor
Merge branch 'master' of https://github.com/McNice/Projekt1

Conflicts:
	MapEditor/MapEditor/MapEditor/Map.cs
	MapEditor/MapEditor/MapEditor/XmlData.cs