Merge branch 'chance' into tao
trex2 batch
add trex2 batch (git commit -a does not include git add -all)
Merge branch 'sprint5' into tao

Conflicts:
	trex2/trex2_tables.py
dust objects
trex2 objects
therps objects
some changes
Merge branch 'tao' into sprint5

Conflicts:
	app.yaml
	iec/iec_model.py