Merge branch 'master' into master

Author: shockey

README.md

@@ -14,6 +14,12 @@ Valid Swagger JSON descriptions can then be generated and used with the full Swa
 
 As a brand new version, written from the ground up, there are some known issues and unimplemented features. Check out the [Known Issues](#known-issues) section for more details.
 
+This repository publishes to two different NPM modules:
+
+* [swagger-editor](https://www.npmjs.com/package/swagger-editor) is a traditional npm module intended for use in JavaScript web application projects that are capable of resolving dependencies (via Webpack, Browserify, etc).
+* [swagger-editor-dist](https://www.npmjs.com/package/swagger-editor-dist) is a dependency-free module that includes everything you need to serve Swagger-Editor in a server-side project, or a web project that can't resolve npm module dependencies.
+
+
 For the older version of swagger-editor, refer to the [*2.x branch*](https://github.com/swagger-api/swagger-editor/tree/2.x).
 
 ## Running locally

dist/swagger-editor-bundle.js

@@ -1,7 +1,7 @@
 {
   "name": "swagger-editor",
   "description": "Swagger Editor",
-  "version": "3.1.7",
+  "version": "3.1.9",
   "main": "dist/swagger-editor.js",
   "repository": "[email protected]:swagger-api/swagger-editor.git",
   "license": "Apache-2.0",
@@ -45,6 +45,7 @@
     "bowser": "1.6.1",
     "classnames": "^2.1.3",
     "core-js": "^2.4.1",
+    "deepmerge": "^1.3.2",
     "immutable": "^3.x.x",
     "js-yaml": "^3.5.5",
     "json-beautify": "^1.0.1",
@@ -56,8 +57,8 @@
     "react-redux": "^4.x.x",
     "react-transition-group": "^1.1.1",
     "redux": "^3.x.x",
-    "swagger-client": "3.1.0",
-    "swagger-ui": "3.2.0",
+    "swagger-client": "^3.1.2",
+    "swagger-ui": "^3.2.2",
     "whatwg-fetch": "^2.0.3"
   },
   "devDependencies": {