Conflicts:
	interface/lib/classes/tform.inc.php
	interface/web/monitor/show_sys_state.php
	interface/web/themes/default/templates/tabbed_form.tpl.htm