Conflicts:
	systems/admin/systems/class_componentGeneric.inc
	systems/admin/systems/class_mobilePhoneGeneric.inc
	systems/admin/systems/class_phoneGeneric.inc
	systems/admin/systems/class_printGeneric.inc
	systems/admin/systems/class_serverGeneric.inc
	systems/admin/systems/class_terminalGeneric.inc
	systems/admin/systems/class_workstationGeneric.inc