Merge branch 'master' into develop

README.md

@@ -6,6 +6,7 @@
 
 [![Build Status](https://travis-ci.org/opensheetmusicdisplay/opensheetmusicdisplay.svg?branch=master)](https://travis-ci.org/opensheetmusicdisplay/opensheetmusicdisplay)
 [![Dependency Status](https://david-dm.org/opensheetmusicdisplay/opensheetmusicdisplay.png)](https://david-dm.org/opensheetmusicdisplay/opensheetmusicdisplay)
+[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/opensheetmusicdisplay/opensheetmusicdisplay?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Display sheet music ([MusicXML](http://www.musicxml.com) files) in the browser.
 Using the [VexFlow](https://github.com/0xfe/vexflow) music notation rendering API.

package.json

@@ -41,7 +41,7 @@
   },
   "homepage": "http://opensheetmusicdisplay.org",
   "dependencies": {
-    "es6-promise": "^3.2.1",
+    "es6-promise": "^4.0.5",
     "jszip": "^3.0.0",
     "loglevel": "^1.4.1",
     "shortid": "^2.2.6",
@@ -49,7 +49,7 @@
     "vexflow": "^1.2.53"
   },
   "devDependencies": {
-    "browserify": "^13.0.1",
+    "browserify": "^14.0.0",
     "chai": "^3.5.0",
     "grunt": "^1.0.1",
     "grunt-browserify": "^5.0.0",
@@ -61,7 +61,7 @@
     "grunt-http-server": "",
     "grunt-karma": "^2.0.0",
     "grunt-ts": "^6.0.0-beta.3",
-    "grunt-tslint": "^3.1.1",
+    "grunt-tslint": "^4.0.0",
     "grunt-typedoc": "^0.2.4",
     "grunt-typings": "^0.1.5",
     "http-server": "",
@@ -76,10 +76,10 @@
     "karma-xml2js-preprocessor": "^0.0.3",
     "mocha": "^3.0.1",
     "phantomjs-prebuilt": "^2.1.8",
-    "tsify": "^1.0.2",
-    "tslint": "3.8.0",
-    "typedoc": "^0.4.4",
+    "tsify": "^3.0.0",
+    "tslint": "4.3.1",
+    "typedoc": "^0.5.0",
     "typescript": "^1.8.10",
-    "typings": "^1.3.1"
+    "typings": "^2.0.0"
   }
 }