For pulling
Merge branch 'master' of https://github.com/nibol/dke-project-2.2

Conflicts:
	src/gui/EditorComponent.java
Fixed problem of deleting to many roads in EditorComponent