Merge master

package.json

@@ -61,6 +61,7 @@
   },
   "dependencies": {
     "@tommoor/slate-drop-or-paste-images": "0.5.1",
+    "aws-sdk": "^2.135.0",
     "babel-core": "^6.24.1",
     "babel-eslint": "^7.2.3",
     "babel-loader": "6.2.5",
@@ -85,7 +86,6 @@
     "css-loader": "^0.28.7",
     "debug": "2.2.0",
     "dotenv": "^4.0.0",
-    "emoji-name-map": "1.1.2",
     "emoji-regex": "^6.5.1",
     "eslint": "^3.19.0",
     "eslint-config-react-app": "^0.6.2",
@@ -100,7 +100,6 @@
     "fbemitter": "^2.1.1",
     "file-loader": "0.9.0",
     "flow-typed": "^2.1.2",
-    "highlight.js": "9.4.0",
     "history": "3.0.0",
     "html-webpack-plugin": "2.17.0",
     "http-errors": "1.4.0",
@@ -109,7 +108,6 @@
     "isomorphic-fetch": "2.2.1",
     "js-cookie": "^2.1.4",
     "js-search": "^1.4.2",
-    "js-tree": "1.1.0",
     "json-loader": "0.5.4",
     "jsonwebtoken": "7.0.1",
     "koa": "^2.2.0",
@@ -126,8 +124,6 @@
     "localforage": "^1.5.0",
     "lodash": "^4.17.4",
     "lodash.orderby": "4.4.0",
-    "marked": "0.3.6",
-    "marked-sanitized": "^0.1.1",
     "mobx": "^3.1.9",
     "mobx-react": "^4.1.8",
     "mobx-react-devtools": "^4.2.11",
@@ -146,7 +142,6 @@
     "react-addons-css-transition-group": "15.3.2",
     "react-dom": "^15.6.1",
     "react-dropzone": "3.6.0",
-    "react-feather": "^1.0.7",
     "react-helmet": "3.1.0",
     "react-keydown": "^1.7.3",
     "react-modal": "^2.2.1",
@@ -171,7 +166,6 @@
     "string-hash": "^1.1.0",
     "style-loader": "^0.18.2",
     "styled-components": "^2.0.0",
-    "truncate-html": "https://github.com/jorilallo/truncate-html/tarball/master",
     "url-loader": "0.5.7",
     "uuid": "2.0.2",
     "validator": "5.2.0",