Fixed Player & Traps Collision Box Display
Fixed BoundingBoxes Parameters
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/obacht/options.js