Merge branch 'master' into typescript

README.md

@@ -1,6 +1,8 @@
 quaggaJS
 ========
 
+[![Join the chat at https://gitter.im/quaggaJS/Lobby](https://badges.gitter.im/quaggaJS/Lobby.svg)](https://gitter.im/quaggaJS/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 - [Changelog](#changelog) (2017-06-07)
 - [Browser Support](#browser-support)
 - [Installing](#installing)

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "quagga",
-  "version": "0.6.14",
+  "version": "0.12.1",
   "description": "An advanced barcode-scanner written in JavaScript",
   "main": "dist/quagga.js",
   "ignore": [

package.json

@@ -3,8 +3,9 @@
   "version": "0.12.1",
   "description": "An advanced barcode-scanner written in JavaScript",
   "main": "lib/quagga.js",
-  "types": "./type-definitions/quagga.d.ts",
+  "typings": "type-definitions/quagga.d.ts",
   "browser": "dist/quagga.min.js",
+  "typings": "type-definitions/quagga.d.ts",
   "devDependencies": {
     "async": "^1.4.2",
     "babel-cli": "^6.5.1",