Merge remote-tracking branch 'upstream/master' into admin_view

* upstream/master:
  Fix typo in readme
  added workaround for build failture
  bump dependencies

Author: Jeff Billimek

Makefile

@@ -19,6 +19,8 @@ getCMDDependencies:
 
 getGoDependencies:
 	go get -v ./...
+	# Workaround for: https://github.com/sirupsen/logrus/issues/824
+	GOOS=windows go get -v ./...
 
 buildProject:
 	rm -rf releases 

README.md

@@ -31,7 +31,7 @@
 
 ![Generate ShareX Configuration](https://user-images.githubusercontent.com/17984549/32700395-cf9f057a-c7c4-11e7-9d2b-7523c8a95a20.png)
 
-## Documenation
+## Documentation
 
 - [Installation](https://github.com/mxschmitt/golang-url-shortener/wiki/Installation)
 - [Configuration](https://github.com/mxschmitt/golang-url-shortener/wiki/Configuration)

web/package.json

@@ -13,20 +13,20 @@
   "dependencies": {
     "moment": "2.22.2",
     "prismjs": "1.15.0",
-    "react": "16.4.2",
-    "react-clipboard.js": "2.0.0",
+    "react": "16.5.2",
+    "react-clipboard.js": "2.0.1",
     "react-datepicker": "1.6.0",
-    "react-dom": "16.4.2",
-    "react-moment": "0.7.9",
+    "react-dom": "16.5.2",
+    "react-moment": "0.8.1",
     "react-prism": "4.3.2",
     "react-qr-svg": "2.1.0",
     "react-responsive": "5.0.0",
     "react-router": "4.3.1",
     "react-router-dom": "4.3.1",
-    "react-scripts": "1.1.4",
+    "react-scripts": "1.1.5",
     "react-table": "6.8.6",
-    "semantic-ui-css": "2.3.3",
-    "semantic-ui-react": "0.82.2",
+    "semantic-ui-css": "2.4.0",
+    "semantic-ui-react": "0.82.5",
     "toastr": "2.1.4"
   },
   "scripts": {