Synchronize edit and show pages

All the fields on the edit page now match those on the show page.
bump version
Merge branch 'release/2.2.14' into develop