Metric changes and additional include in DefinedTypeDetail
More updates to Metric, add a view detail option with edit that displays by default
Redo changes that got overwritten, update Rock controls that David pushed
Add migration to refactor metric blocks
More changes to fix controls that were changed