Fixes embedded type not displaying correctly in draft and potentially wiping out data on publish.
Merge branch 'release/2.1'
Merge branch 'master' of github.com:perfectsense/brightspot-cms