Conflicts:
	bt5/erp5_web_ung_core/bt/revision
	bt5/erp5_web_ung_theme/bt/change_log
	bt5/erp5_web_ung_theme/bt/revision