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
sip ld50 mammal avian
Got Terrplant QA/QC page working
Merge branch 'chance' into sprint5
PFAM: Javascript errors fixed
Merge branch 'jon' into sprint5
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
sip updates body weight
Merge branch 'marcia' into sprint5
adding stubbed out unit testing code