stir algorithm bug fix
Merge branch 'sprint7' into marcia
ubertool object update with new trex crosswalk
Merge branch 'marcia' into sprint7
Merge branch 'tao' into sprint7