Merge changes
Merge branch 'master' of
https://code.nceas.ucsb.edu/git/nceas-staff/datadepot.git

Conflicts:
	metacatui/src/main/webapp/js/views/MetadataView.js