Added DebugOption to draw BoundingBoxes (not drawn on correct position right now!)
Updated TrapManager destructor
Merge remote-tracking branch 'origin/master'