Merge remote-tracking branch 'origin/master' into karelkryda_master

# Conflicts:
#	server/model/monitor.js
#	server/model/status_page.js
#	src/languages/en.js

server/socket-handlers/docker-socket-handler.js

@@ -56,7 +56,7 @@ module.exports.dockerSocketHandler = (socket) => {
             let amount = await DockerHost.testDockerHost(dockerHost);
             let msg;
 
-            if (amount > 1) {
+            if (amount >= 1) {
                 msg = "Connected Successfully. Amount of containers: " + amount;
             } else {
                 msg = "Connected Successfully, but there are no containers?";