XXX the conflicts were not resolved carefuly:

 Conflicts:
	bt5/erp5_officejs/PathTemplateItem/web_page_module/jio_zipfilestorage-with-jszip_js.xml
	bt5/erp5_officejs/bt/template_keep_last_workflow_history_only_path_list
	bt5/erp5_officejs/bt/template_path_list
	bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_launcher_js.js
	bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_html5_select_js.js
	tests/__init__.py