Merge branch 'chance' into tao
Revert "got rid of links on right side of ubertool pages"

This reverts commit 10c0ed56f2e333eab2471980f1987652a9c33fd2.
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
HH: Tabs fixed (History tabs)
some changes
fixed terrplant and adding gae/openid/login capabilities
Merge branch 'tao' into sprint5

Conflicts:
	app.yaml
	iec/iec_model.py
Merge branch 'chance' into sprint5
Fixed PDF/HTML Export
Merge branch 'jon' into sprint5

Conflicts:
	templates/export.html
Input / Outpage Page Styling & Trex2 Collapsible fix
app.yaml version = sprint5
fix dust mongo
Merge branch 'master' into sprint5