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