Add funnel radius to JSON definitions.
Merge remote-tracking branch 'iane/json-traps' into traptrap

Conflicts:
	src/trapdef.cpp