Update to trunk 10350
Added fallback mode for testing collision functions
Cleaned out unused debug variables in beam.cpp