trex ubertool object parts
TerrPlant: QAQC, Output, and Calculation Error Fixes
Merge branch 'jon' into sprint6
trex2 ubertool object updates
Merge branch 'marcia' into sprint6

Conflicts:
	trex2/trex2_model.py
	trex2/trex2_parameters.py
Merge branch 'sprint6' into tao