RSM

.......... [ZBXNEXT-5569] updated to latest from /master; resolved conflicts in:

#	frontends/php/app/partials/layout.htmlpage.menu.php
#	frontends/php/app/views/layout.htmlpage.php
#	frontends/php/app/views/monitoring.dashboard.list.php
#	frontends/php/app/views/monitoring.dashboard.view.php
#	frontends/php/app/views/monitoring.discovery.view.php
#	frontends/php/app/views/monitoring.latest.view.php
#	frontends/php/app/views/monitoring.map.view.php
#	frontends/php/app/views/monitoring.problem.view.php
#	frontends/php/app/views/monitoring.web.view.php
#	frontends/php/app/views/report.services.php
#	frontends/php/assets/styles/blue-theme.css
#	frontends/php/assets/styles/dark-theme.css
#	frontends/php/assets/styles/hc-dark.css
#	frontends/php/assets/styles/hc-light.css
#	frontends/php/httpdetails.php
#	frontends/php/include/classes/core/ZBase.php
#	frontends/php/include/classes/html/widget/CWidget.php
#	frontends/php/include/classes/mvc/CView.php
#	frontends/php/include/defines.inc.php
#	frontends/php/include/html.inc.php
#	frontends/php/include/menu.inc.php
#	frontends/php/include/page_header.php
#	frontends/php/include/views/general.browserwarning.php
#	frontends/php/include/views/inventory.host.view.php
#	frontends/php/include/views/monitoring.charts.php
#	frontends/php/include/views/monitoring.history.php
#	frontends/php/include/views/monitoring.hostscreen.php
#	frontends/php/include/views/monitoring.overview.items.php
#	frontends/php/include/views/monitoring.overview.triggers.php
#	frontends/php/include/views/monitoring.screen.php
#	frontends/php/include/views/monitoring.slides.php
#	frontends/php/jsLoader.php
#	frontends/php/srv_status.php
#	frontends/php/tr_events.php
#	sass/dashboard.html
#	sass/stylesheets/sass/screen.scss
#	src/libs/zbxdbupgrade/dbupgrade_4050.c