fix collision detection
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Source/CWalker.java
	src/Util/CGraph.java
merge with bohni