Merge origin/master into alfa

Conflicts:
	CHANGELOG.md
	src/CometQLProxy_connection.cpp
	src/CometQLProxy_connection.h
	src/dbLink.h
	src/ini_parser/ini_parser.hpp
	src/main.h

Author: VictorTrapenok

CHANGELOG.md

@@ -89,4 +89,4 @@ FEATURES:
  * Added server version to ws answer
  * Js Api version 3.26
  * Removed message `setState` from console log in Js Api
- * Fixed bug when Js api in offline
+ * Fixed bug when Js api in offline

src/MySql_connection.cpp

@@ -2692,4 +2692,4 @@ void MySql_connection::addIntervalRoutine()
         local_buf->db.query_format("DELETE FROM `pipe_messages` where time < %d and pipe_name like 'trust_%%' ", time(0) - 120);
     });
 
-}
+}

src/ini_parser/ini_parser.hpp

@@ -499,4 +499,4 @@ class ini_parser
         std::string current_section;
 };
 
-#endif
+#endif

src/tcpServer_benchmark.cpp

@@ -252,4 +252,4 @@ void usage_statistics::start()
         exportdata.append("end=true");
         send(exportdata);
     });
-}
+}