merge sprint6 back to tao
fix przm przm_exams_units
fix TREX per Gelmann's comments
update sip folder
Merge branch 'sprint6' into tao

Conflicts:
	sip/sip_model_new.py
	trex2/trex2_tables.py