Commit material form and datadir change
Merge branch 'current-sprint' of https://github.com/prisms-center/materialscommons.org into current-sprint