Zabbix

.......... [ZBXNEXT-6940] updated to latest master; conflicts resolved in:

#	sass/stylesheets/sass/screen.scss
#	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/classes/html/svg/CSvg.php
#	ui/include/classes/html/svg/CSvgGraphAnnotation.php
#	ui/include/classes/html/svg/CSvgGraphGrid.php
#	ui/include/classes/html/svg/CSvgText.php
#	ui/include/classes/widgets/CWidgetHelper.php
#	ui/include/classes/widgets/views/js/widget.clock.form.view.js.php
#	ui/include/classes/widgets/views/widget.clock.form.view.php
#	ui/include/classes/widgets/views/widget.svggraph.form.view.php