Conflicts:
	bt5/erp5_wendelin/DocumentTemplateItem/portal_components/document.erp5.DataArray.py
	bt5/erp5_wendelin/DocumentTemplateItem/portal_components/document.erp5.DataArray.xml
	bt5/erp5_wendelin/DocumentTemplateItem/portal_components/document.erp5.DataBucketStream.py
	bt5/erp5_wendelin/DocumentTemplateItem/portal_components/document.erp5.DataBucketStream.xml
	bt5/erp5_wendelin/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
	bt5/erp5_wendelin/bt/template_action_path_list
	bt5/erp5_wendelin/bt/template_portal_type_id_list
	bt5/erp5_wendelin/bt/template_portal_type_property_sheet_list