Merge pull request #225 from skycoin/master

Merge Master to develop

.snyk

@@ -12,4 +12,9 @@ patch:
     - karma > socket.io > socket.io-adapter > socket.io-parser > debug > ms: null
     - karma > log4js > mailgun-js > debug > ms:
         patched: '2018-05-04T03:41:07.077Z'
+  'npm:tunnel-agent:20170305':
+    - karma > log4js > loggly > request > tunnel-agent:
+        patched: '2018-06-26T08:10:05.074Z'
+    - '@angular-devkit/build-angular > node-sass > request > tunnel-agent':
+        patched: '2018-06-26T08:10:05.074Z'
 patched: '2018-04-18T04:53:49.215Z'

README.md

@@ -2,7 +2,7 @@
 
 # Skycoin Explorer
 
-[![Build Status](https://travis-ci.org/skycoin/skycoin-explorer.svg)](https://travis-ci.org/skycoin/skycoin-explorer)
+[![Build Status](https://travis-ci.org/skycoin/skycoin-explorer.svg?branch=develop)](https://travis-ci.org/skycoin/skycoin-explorer)
 
 https://explorer.skycoin.net
 

package.json

@@ -32,7 +32,7 @@
     "moment": "^2.21.0",
     "rxjs": "^5.5.2",
     "zone.js": "^0.8.14",
-    "snyk": "^1.78.0"
+    "snyk": "^1.85.0"
   },
   "devDependencies": {
     "@angular/cli": "^6.0.0",
@@ -50,7 +50,7 @@
     "karma-coverage-istanbul-reporter": "^1.4.2",
     "karma-jasmine": "~1.1.0",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "~5.3.2",
+    "protractor": "~5.4.0",
     "ts-node": "~3.2.0",
     "tslint": "~5.7.0",
     "typescript": "~2.4.2",