Rozluzniono relacje
Merge branch 'master' of
https://github.com/19booob92/ProjektZespolowy.git

Conflicts:
	src/main/java/Editor/XmlBuilder.java
	src/main/java/Map/MarkerRect.java