Fixes NPE in content edit page when template isn't available.
Add field display name to the GuideType object
Merge branch 'release/2.0' of https://github.com/perfectsense/brightspot-cms into feature/productionguides