Zabbix

..F....... [ZBXNEXT-2102,ZBXNEXT-3890] merged with parent branch; resolved conflicts in:
- frontends/php/app/controllers/CControllerDashboardView.php
- frontends/php/app/controllers/CControllerDashbrdWidgetConfig.php
- frontends/php/app/controllers/CControllerWidgetDataOverView.php
- frontends/php/app/controllers/CControllerWidgetTrigOverView.php
- frontends/php/include/classes/widgetfields/CWidgetField.php
- frontends/php/include/classes/widgetfields/CWidgetFieldComboBox.php
- frontends/php/include/classes/widgetfields/CWidgetFieldGroup.php
- frontends/php/include/classes/widgetfields/CWidgetFieldHidden.php
- frontends/php/include/classes/widgetfields/CWidgetFieldNumericBox.php
- frontends/php/include/classes/widgetfields/CWidgetFieldRadioButtonList.php
- frontends/php/include/classes/widgetfields/CWidgetFieldSelectResource.php
- frontends/php/include/classes/widgetfields/CWidgetFieldTextBox.php
- frontends/php/include/classes/widgetfields/CWidgetFieldWidgetListComboBox.php
- frontends/php/include/classes/widgets/CActionLogWidgetForm.php
- frontends/php/include/classes/widgets/CClockWidgetForm.php
- frontends/php/include/classes/widgets/CDataOverviewWidgetForm.php
- frontends/php/include/classes/widgets/CSysmapWidgetForm.php
- frontends/php/include/classes/widgets/CTrigOverviewWidgetForm.php
- frontends/php/include/classes/widgets/CUrlWidgetForm.php
- frontends/php/include/classes/widgets/CWidgetConfig.php
- frontends/php/include/classes/widgets/CWidgetForm.php
- frontends/php/js/dashboard.grid.js