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
sdfasdf
stir_model updates
trex2 objects
therps objects
App.yaml : "sprint5"
Merge branch 'jon' into sprint5
trying to openid, google, etc.
merging sprint5 code into chance branch:
making some small changes to authentication code, still not working completely
stir model updates
Merge branch 'sprint5' into tom

Conflicts:
	app.yaml
	dust/dust_tables.py
app.yaml and dust parameter change
Merge branch 'marcia' into sprint5

Conflicts:
	app.yaml
some changes
fixed terrplant and adding gae/openid/login capabilities