Changing enum for biosample type from primary cell line to primary cells and adding embryonic stem cells
Merge remote-tracking branch 'origin/master' into 1393-new_biosample_types
Fixing up the upgrade script
src/encoded/commands/upgrade.py
We need to upgrade experiments as well as biosamples
Per Eurie request, we have moved back to singular and removed embryonic from the phrase
Had to modify the behave test since some items are stem cell now
Primary cells in biosamples are now 3 not 2
Fixing merge conflict with master regarding upgrade scripts
Unmerging from release10 and setting up for release11
Finishing my save of the moving stuff out of upgrade from release10 to release11
Increment the schemas
Mv the experiment upgrade back into dataset
Fixing merge conflict in the upgrade list
Merge pull request #278 from ENCODE-DCC/1393-new_biosample_types

1393 new biosample types
Merging in master; no conflicts.