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
sdfasdf
stir_model updates
trex2 objects
therps objects
beginnings of user login system, basically all of the registration/login working except need session id added to user document and output to response as a cookie.
Added capability of locking down REST API to users with access to their API key, either via logging into the website or using the REST interface with their user id and associated API key
adding stubbed out unit testing code
small change to remove login and register from header, so can merge changes to sprint5
Merge branch 'chance' into sprint5
Adding registration/login capabilities, but have commented out the header links
Landing Page Updates
Merge branch 'jon' into sprint5

Conflicts:
	templates/01uberheader.html
Fixed "Login/Register" conflicts
App.yaml : "sprint5"
History Pages Created: Eco & HH