add pfam-jquery back
fix after sprint 2
extra sprint 2 fix

remove output right link
remove this
PPFAM jQuery page
Thumbs.db!!!
App.yaml Jon
PFAM - Removed "Links Right"
Model Output Pages (Tao)
Merge remote-tracking branch 'origin/marcia'
Merge remote-tracking branch 'origin/tao'
fix pfam-jquery
Conflicts:
	templates/pfam-jquery.html
iec model description
Fixing some issues with prior merge
small change
Adding changes to node server
small issue
sprint3 app.yaml
sip stir terrplant pdf
Merge remote-tracking branch 'origin/tao'
remote merge
Conflicts:
	images/Thumbs.db
	images/tabs/hh/sprites/Thumbs.db
version

Merge remote-tracking branch 'origin/master' into marcia

Conflicts:
	templates/getpdf_jquery.html
	templates/pfam-jquery.html