trex ubertool object parts
trex2 ubertool object updates
Merge branch 'marcia' into sprint6

Conflicts:
	trex2/trex2_model.py
	trex2/trex2_parameters.py
timestamps for terrestrial models
add trex2 multiple qaqc cases
Merge branch 'sprint6' into tao
add rice back
fixing some conflicts
ar_lb swap for rate_out
Merge branch 'sprint6' into tom
some timestamp collisions
Merge branch 'sprint6' into jon