Merge branch 'release/2.2.13' into develop
Fixed style issue
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'