Conflicts:
	master/bt5/vifib_erp5/bt/revision
	master/bt5/vifib_open_trade/bt/revision
	master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/person_slap_interface_workflow/scripts/Person_requestSoftwareInstance.xml
	master/bt5/vifib_slap/bt/revision