Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/game/towers/workers/PathWorker.java
	src/resources/configs/npcs.xml

worked pathworker