diff --git a/README.md b/README.md
index 6bce2db844..bffd87ffa5 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,7 @@ ThingsBoard is an open-source IoT platform for data collection, processing, visu
+
## Documentation
ThingsBoard documentation is hosted on [thingsboard.io](https://thingsboard.io/docs).
@@ -14,6 +15,9 @@ ThingsBoard documentation is hosted on [thingsboard.io](https://thingsboard.io/d
[**Smart energy**](https://thingsboard.io/smart-energy/)
[](https://thingsboard.io/smart-energy/)
+[**SCADA Swimming pool**](https://thingsboard.io/use-cases/scada/)
+[](https://thingsboard.io/use-cases/scada/)
+
[**Fleet tracking**](https://thingsboard.io/fleet-tracking/)
[](https://thingsboard.io/fleet-tracking/)
@@ -32,7 +36,6 @@ Collect and Visualize your IoT data in minutes by following this [guide](https:/
## Support
- - [Q&A forum](https://groups.google.com/forum/#!forum/thingsboard)
- [Stackoverflow](http://stackoverflow.com/questions/tagged/thingsboard)
## Licenses
diff --git a/application/pom.xml b/application/pom.xml
index 2ad4f3a9a6..d775942f8a 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 4.0.1-RC
+ 4.1.0-RC
thingsboard
application
@@ -128,6 +128,10 @@
org.thingsboard.common
edqs
+
+ org.thingsboard.common
+ discovery-api
+
org.thingsboard
dao
diff --git a/application/src/main/data/json/demo/dashboards/rule_engine_statistics.json b/application/src/main/data/json/demo/dashboards/rule_engine_statistics.json
index 0cfcebef5d..272de5848f 100644
--- a/application/src/main/data/json/demo/dashboards/rule_engine_statistics.json
+++ b/application/src/main/data/json/demo/dashboards/rule_engine_statistics.json
@@ -564,6 +564,7 @@
},
"tooltipDateColor": "rgba(0, 0, 0, 0.76)",
"tooltipDateInterval": true,
+ "tooltipHideZeroValues": true,
"tooltipBackgroundColor": "rgba(255, 255, 255, 0.76)",
"tooltipBackgroundBlur": 4,
"animation": {
@@ -977,6 +978,7 @@
},
"tooltipDateColor": "rgba(0, 0, 0, 0.76)",
"tooltipDateInterval": true,
+ "tooltipHideZeroValues": true,
"tooltipBackgroundColor": "rgba(255, 255, 255, 0.76)",
"tooltipBackgroundBlur": 4,
"animation": {
diff --git a/application/src/main/data/json/system/scada_symbols/3-phase-voltage-relay-hp.svg b/application/src/main/data/json/system/scada_symbols/3-phase-voltage-relay-hp.svg
index f6d881b172..8e1a46978e 100644
--- a/application/src/main/data/json/system/scada_symbols/3-phase-voltage-relay-hp.svg
+++ b/application/src/main/data/json/system/scada_symbols/3-phase-voltage-relay-hp.svg
@@ -1,6 +1,6 @@