Renamed Item.data and Template.data to pb

This removes the redefinition of the collection+json data field
to add compatibility with collection+json.