Merge branch 'master' into develop

testing/jstring_test.cpp

@@ -31,8 +31,10 @@ int main(int argc, char **argv) {
 //   std::cout << "--------" << std::endl;
 //   std::cout << "key2: " << test2["key2"] << std::endl;
 
+   coreutils::MString test0("{\"Number:\"0\",\"id\":\"XXXXX\"}");
    coreutils::JString test1;
    coreutils::MString test2;
+   test1 = test0;
    test1["name"] = "Cohen";
    test1["health"] = "100";
    test1["comment"] = "this is a comment";