Merge branch 'master' of C:\java\ch.bfh.bti7301.w2013.FuSi with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Source/CWalker.java
resolved conflicts and add CCollisionList