Merge branch 'staging' into cds
Merge branch 'cds' into staging
One line for the process related group title
removed an unintentionally added 'p'
fixes caching problem with fields full blastp details #2733
Merge remote-tracking branch 'origin/staging' into staging
Remove trailing whitespace - all files
Merge branch 'staging' into topic_bug
Merge branch 'topic_bug' into staging
Merge branch 'remarks' of https://github.com/acabunoc/website into acabunoc-remarks
resolving conflict involving whitespace removal
Merge branch 'whitespace' into staging
Merge branch 'staging' into blastp-cache
Merge pull request #2942 from acabunoc/remarks

Add remarks to the Laborary overview widget
Deleted directory containing our old test suite
* hopefully this will clear up some confusion
Moved 'Lab Website' from the highlight box to the main part of the overview widget
Merge pull request #2947 from WormBase/Lab

Moved 'Lab Website' from the highlight box to the main part of the overview widget.
Merge remote-tracking branch 'origin/staging' into staging
Merge branch 'staging' into remove-old-tests
Merge branch 'remove-old-tests' into staging