Added parent-child collision handling to srdf export
Merge branch 'srdf_export_coll'