Re-enable log-messages
Player collision detection
Some logging cleanup
Fix colllision detection (collide with itself)
Merge remote-tracking branch 'origin/develop/david'