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

Conflicts:
	trex2/trex2_model.py
	trex2/trex2_parameters.py