Merge "Add a Resource detail view"