Put changes to conversion back in.
fixed the media type merge
Delete old drafts.
active tab fixed
Merge branch 'current-sprint' of github.com:prisms-center/materialscommons.org into current-sprint
Add MCDB_CONNECTION to test branch in code.
Merge branch 'current-sprint' of github.com:prisms-center/materialscommons.org into current-sprint
Merge branch 'current-sprint' into new-samples