Use entity_type and entity_properties to combine all of the details tabs into one template
Merge remote-tracking branch 'nikki-bitbucket/templates-details-part2' into beta

* nikki-bitbucket/templates-details-part2:
  Use entity_type and entity_properties to combine all of the details tabs into one template