Merge branch 'master' into develop
Added zabbix config
Merge branch 'develop'