Merge branch 'master' into text-deflist

package.json

@@ -1,7 +1,7 @@
 {
   "name": "boost",
   "productName": "Boostnote",
-  "version": "0.11.9",
+  "version": "0.11.10",
   "main": "index.js",
   "description": "Boostnote",
   "license": "GPL-3.0",
@@ -53,7 +53,7 @@
     "aws-sdk": "^2.48.0",
     "aws-sdk-mobile-analytics": "^0.9.2",
     "chart.js": "^2.7.2",
-    "codemirror": "^5.39.0",
+    "codemirror": "^5.40.2",
     "codemirror-mode-elixir": "^1.1.1",
     "electron-config": "^1.0.0",
     "electron-gh-releases": "^2.0.2",
@@ -119,8 +119,10 @@
     "babel-preset-react-hmre": "^1.0.1",
     "babel-register": "^6.11.6",
     "browser-env": "^3.2.5",
+    "color": "^3.0.0",
     "concurrently": "^3.4.0",
     "copy-to-clipboard": "^3.0.6",
+    "css": "^2.2.4",
     "css-loader": "^0.19.0",
     "devtron": "^1.1.0",
     "dom-storage": "^2.0.2",