Zabbix

.......... [ZBXNEXT-6148] updated to latest from /master; resolved conflicts in:
# create/src/schema.tmpl
# sass/stylesheets/sass/screen.scss
# src/libs/zbxdbupgrade/dbupgrade_5010.c
# ui/app/controllers/CControllerDashboardView.php
# ui/app/controllers/CControllerHostViewRefresh.php
# ui/app/controllers/CControllerProblemView.php
# ui/app/controllers/CControllerWidgetGraphView.php
# ui/app/views/monitoring.dashboard.list.php
# ui/app/views/monitoring.dashboard.view.php
# ui/app/views/monitoring.widget.graph.view.php
# ui/app/views/monitoring.widget.problemhosts.view.php
# ui/assets/styles/blue-theme.css
# ui/assets/styles/dark-theme.css
# ui/assets/styles/hc-dark.css
# ui/assets/styles/hc-light.css
# ui/include/blocks.inc.php
# ui/include/classes/api/CApiServiceFactory.php
# ui/include/classes/api/services/CDashboard.php
# ui/include/classes/api/services/CTask.php
# ui/include/classes/api/services/CTemplateScreen.php
# ui/include/classes/api/services/CTemplateScreenItem.php
# ui/include/defines.inc.php
# ui/include/hostgroups.inc.php
# ui/include/schema.inc.php
# ui/include/views/configuration.maintenance.edit.php
# ui/include/views/monitoring.screen.list.php
# ui/js/menupopup.js