Display donor info again; redmine 824
Display donor info again; redmine 824
Merge branch 'display-donor-824' of https://github.com/ENCODE-DCC/encoded into display-donor-824

Conflicts:
	src/encoded/static/components/biosample.js
Added treatment and depleted details to json output.
Code refactor - match conventions in UI JS.
Added DepletedIn and Treatments to Assay Details; redmine 776
Merge branch 'master' into exp-treatment-depleted-776
Add pytest.mark.fixture_lock to prevent overlapping modification of globals. Fix the way layers are calculated.
Mark relevant fixtures as using the DBSession global. Fix browser test fixtures so as not to use conflicting fixtures.
Merge pull request #99 from ENCODE-DCC/display-donor-824

Display donor 824
Merge pull request #102 from ENCODE-DCC/fix-conflicting-tests

Fix conflicting tests
Embedding is only relevant for linked objects.
Switch 'hide' pattern.
Switch 'hide' patterm, Mk II. Added 'tests'.
.length works without throwing errors now.
Set npm_config_cache to avoid problems building on travis.
Merge pull request #101 from ENCODE-DCC/exp-treatment-depleted-776

Exp treatment depleted 776
Added output type to table.
Added 'subcellular_fraction' to the search in experiments.
Merge remote-tracking branch 'origin/master' into 1046_sub_fraction