Merge branch 'develop' into feature/issue269

# Conflicts:
#	README.md

ChangeLog.md

@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file. This projec
 
 [Full Changelog](https://github.com/nlohmann/json/compare/v1.1.0...HEAD)
 
+- concatenate objects [\#252](https://github.com/nlohmann/json/issues/252)
 - Unit test fails when doing a CMake out-of-tree build [\#241](https://github.com/nlohmann/json/issues/241)
 - Additional integration options [\#237](https://github.com/nlohmann/json/issues/237)
 - Can't use basic\_json::iterator as a base iterator for std::move\_iterator [\#233](https://github.com/nlohmann/json/issues/233)
@@ -14,6 +15,7 @@ All notable changes to this project will be documented in this file. This projec
 - Add support for afl-fuzz testing [\#207](https://github.com/nlohmann/json/pull/207) ([mykter](https://github.com/mykter))
 - Issue \#178 - Extending support to full uint64\_t/int64\_t range and unsigned type \(updated\) [\#193](https://github.com/nlohmann/json/pull/193) ([twelsby](https://github.com/twelsby))
 
+- Maybe a bug [\#258](https://github.com/nlohmann/json/issues/258)
 - -Wconversion warnings [\#239](https://github.com/nlohmann/json/issues/239)
 - ambiguous overload for 'push\_back' and 'operator+=' [\#235](https://github.com/nlohmann/json/issues/235)
 - double values are serialized with commas as decimal points [\#228](https://github.com/nlohmann/json/issues/228)
@@ -26,11 +28,18 @@ All notable changes to this project will be documented in this file. This projec
 - Floating point exceptions [\#181](https://github.com/nlohmann/json/issues/181)
 - In basic\_json::basic\_json\(const CompatibleArrayType& val\), the requirement of CompatibleArrayType is not strict enough. [\#174](https://github.com/nlohmann/json/issues/174)
 - Implicit assignment to std::string fails [\#144](https://github.com/nlohmann/json/issues/144)
+- Fix Issue \#265 [\#266](https://github.com/nlohmann/json/pull/266) ([06needhamt](https://github.com/06needhamt))
 - Issue \#195 - update Travis to Trusty due to gcc/clang strtod\(\) bug [\#196](https://github.com/nlohmann/json/pull/196) ([twelsby](https://github.com/twelsby))
 
+- Compiler Errors With JSON.hpp [\#265](https://github.com/nlohmann/json/issues/265)
+- VS2015 compile fail [\#260](https://github.com/nlohmann/json/issues/260)
+- Error when using json in g++ [\#254](https://github.com/nlohmann/json/issues/254)
+- Update long-term goals [\#246](https://github.com/nlohmann/json/issues/246)
+- Error compile Android NDK  error: 'strtof' is not a member of 'std' [\#219](https://github.com/nlohmann/json/issues/219)
 - Conflicting typedef of ssize\_t on Windows 32 bit when using Boost.Python [\#204](https://github.com/nlohmann/json/issues/204)
 - Integer conversion to unsigned [\#178](https://github.com/nlohmann/json/issues/178)
 
+- Define CMake/CTest tests [\#247](https://github.com/nlohmann/json/pull/247) ([robertmrk](https://github.com/robertmrk))
 - Out of tree builds and a few other miscellaneous CMake cleanups. [\#242](https://github.com/nlohmann/json/pull/242) ([ChrisKitching](https://github.com/ChrisKitching))
 - Implement additional integration options [\#238](https://github.com/nlohmann/json/pull/238) ([robertmrk](https://github.com/robertmrk))
 - make serialization locale-independent [\#232](https://github.com/nlohmann/json/pull/232) ([nlohmann](https://github.com/nlohmann))

test/src/unit.cpp

@@ -10371,7 +10371,7 @@ TEST_CASE("README", "[hide]")
         // create object from string literal
         json j = "{ \"happy\": true, \"pi\": 3.141 }"_json;
 
-        // or even nicer (thanks http://isocpp.org/blog/2015/01/json-for-modern-cpp)
+        // or even nicer with a raw string literal
         auto j2 = R"(
           {
             "happy": true,
@@ -10499,7 +10499,7 @@ TEST_CASE("README", "[hide]")
     }
 
     {
-        /// strings
+        // strings
         std::string s1 = "Hello, world!";
         json js = s1;
         std::string s2 = js;
@@ -10522,6 +10522,40 @@ TEST_CASE("README", "[hide]")
 
         // etc.
     }
+
+    {
+        // a JSON value
+        json j_original = R"({
+          "baz": ["one", "two", "three"],
+          "foo": "bar"
+        })"_json;
+
+        // access members with a JSON pointer (RFC 6901)
+        j_original["/baz/2"_json_pointer];
+        // "two"
+
+        // a JSON patch (RFC 6902)
+        json j_patch = R"([
+          { "op": "replace", "path": "/baz", "value": "boo" },
+          { "op": "add", "path": "/hello", "value": ["world"] },
+          { "op": "remove", "path": "/foo"}
+        ])"_json;
+
+        // apply the patch
+        json j_result = j_original.patch(j_patch);
+        // {
+        //    "baz": "boo",
+        //    "hello": ["world"]
+        // }
+
+        // calculate a JSON patch from two JSON values
+        json::diff(j_result, j_original);
+        // [
+        //   { "op":" replace", "path": "/baz", "value": ["one", "two", "three"] },
+        //   { "op":"remove","path":"/hello" },
+        //   { "op":"add","path":"/foo","value":"bar" }
+        // ]
+    }
 }
 
 TEST_CASE("algorithms")