Basic admin grid for content updates
Added content type column to admin grid
Fixed merge conflict