added knofensa
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/de/ilusionstudios/siege/xghost/level/LevelLoader.java
Merge remote-tracking branch 'origin/master'
added knofensa