Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

2025-01-18 10:52:19 +01:00 · 2016-06-02 21:48:53 -07:00 · 2016-06-02 21:48:53 -07:00 · 8feae9075a
commit 8feae9075a
parent 96835e1512 0b4187d37b
45 changed files with 693 additions and 590 deletions
--- a/.hound.yml
+++ b/.hound.yml
@ -10,7 +10,7 @@ javascript:

 eslint:
  enabled: true
-  config_file: js/.eslintrc
+  config_file: js/.eslintrc.json

 jscs:
  enabled: true
--- a/.travis.yml
+++ b/.travis.yml
@ -5,7 +5,7 @@ git:
  depth: 10
 node_js:
  - "4"
-  - "5"
+  - "6"
 before_install:
  # Remove ./node_modules/.bin from PATH so node-which doesn't replace Unix which and cause RVM to barf. See https://github.com/travis-ci/travis-ci/issues/5092
  - export PATH=$(python -c 'from sys import argv;from collections import OrderedDict as od;print(":".join(od((p,None) for p in argv[1].split(":") if p.startswith("/")).keys()))' "$PATH")
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -4,7 +4,7 @@ GEM
    colorator (0.1)
    ffi (1.9.10)
    ffi (1.9.10-x64-mingw32)
-    jekyll (3.1.2)
+    jekyll (3.1.6)
      colorator (~> 0.1)
      jekyll-sass-converter (~> 1.0)
      jekyll-watch (~> 1.1)
@ -18,21 +18,21 @@ GEM
    jekyll-sass-converter (1.4.0)
      sass (~> 3.4)
    jekyll-sitemap (0.10.0)
-    jekyll-watch (1.3.1)
-      listen (~> 3.0)
-    kramdown (1.10.0)
+    jekyll-watch (1.4.0)
+      listen (~> 3.0, < 3.1)
+    kramdown (1.11.1)
    liquid (3.0.6)
-    listen (3.0.6)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9.7)
-    mercenary (0.3.5)
+    listen (3.0.8)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    mercenary (0.3.6)
    rake (10.5.0)
    rb-fsevent (0.9.7)
    rb-inotify (0.9.7)
      ffi (>= 0.5.0)
    rouge (1.10.1)
    safe_yaml (1.0.4)
-    sass (3.4.21)
+    sass (3.4.22)
    scss_lint (0.47.1)
      rake (>= 0.9, < 11)
      sass (~> 3.4.15)
@ -48,4 +48,4 @@ DEPENDENCIES
  scss_lint (~> 0.47.1)

 BUNDLED WITH
-   1.11.2
+   1.12.5
--- a/Gruntfile.js
+++ b/Gruntfile.js
@ -1,6 +1,7 @@
 /*!
 * Bootstrap's Gruntfile
 * http://getbootstrap.com
+ * Copyright 2013-2016 The Bootstrap Authors
 * Copyright 2013-2016 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 */
@ -106,13 +107,6 @@ module.exports = function (grunt) {
      }
    },

-    eslint: {
-      options: {
-        configFile: 'js/.eslintrc'
-      },
-      target: 'js/src/*.js'
-    },
-
    jscs: {
      options: {
        config: 'js/.jscsrc'
@ -437,7 +431,7 @@ module.exports = function (grunt) {
    testSubtasks.push('saucelabs-qunit');
  }
  grunt.registerTask('test', testSubtasks);
-  grunt.registerTask('test-js', ['eslint', 'jscs:core', 'jscs:test', 'jscs:grunt', 'qunit']);
+  grunt.registerTask('test-js', ['jscs:core', 'jscs:test', 'jscs:grunt', 'qunit']);

  // JS distribution task.
  grunt.registerTask('dist-js', ['babel:dev', 'concat', 'babel:dist', 'stamp', 'uglify:core', 'commonjs']);
--- a/1
+++ b/1
@ -1,6 +1,7 @@
 The MIT License (MIT)

 Copyright (c) 2011-2016 Twitter, Inc.
+Copyright (c) 2011-2016 The Bootstrap Authors

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/README.md
+++ b/README.md
@ -131,4 +131,4 @@ See [the Releases section of our GitHub project](https://github.com/twbs/bootstr

 ## Copyright and license

-Code and documentation copyright 2011-2016 Twitter, Inc. Code released under [the MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE).
+Code and documentation copyright 2011-2016 the Bootstrap Authors and Twitter, Inc. Code released under [the MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE).
--- a/_config.yml
+++ b/_config.yml
@ -41,7 +41,7 @@ cdn:
  css_hash:       "sha384-y3tfxAZXuh4HwSYylfB+J125MxIs6mR5FOHamPBG064zB+AFeWH94NdvaCBm8qnd"
  js:             https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.2/js/bootstrap.min.js
  js_hash:        "sha384-vZ2WRJMwsjRMW/8U7i6PWi6AlO1L79snBrmgiDpgIWJ82z8eA5lenwvxbMV1PAh7"
-  jquery:         https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js
-  jquery_hash:    "sha384-mXQoED/lFIuocc//nss8aJOIrz7X7XruhR6bO+sGceiSyMELoVdZkN7F0oYwcFH+"
+  jquery:         https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js
+  jquery_hash:    "sha384-rY/jv8mMhqDabXSo+UCggqKtdmBfd3qC2/KvyTDNQ6PcUJXaxK1tMepoQda4g5vB"
  tether:         https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js
  tether_hash:    "sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB"
--- a/docs/_data/browser-bugs.yml
+++ b/docs/_data/browser-bugs.yml
@ -114,7 +114,7 @@
  summary: >
    Right border of `<select>` menu is sometimes missing when screen is set to uncommon resolution
  upstream_bug: >
-    Mozilla#924068
+    Mozilla#545685
  origin: >
    Bootstrap#15990

@ -158,16 +158,6 @@
  origin: >
    Bootstrap#15832

-
-  browser: >
-    Chrome
-  summary: >
-    Focus ring of image map within a modal is displayed in the wrong location.
-  upstream_bug: >
-    Chromium#475128
-  origin: >
-    Bootstrap#16180
-
 -
  browser: >
    Chrome
@ -188,16 +178,6 @@
  origin: >
    Bootstrap#16022

-
-  browser: >
-    Chrome
-  summary: >
-    `width: 1%` on nested table cell causes its table to hog horizontal space.
-  upstream_bug: >
-    Chromium#427994
-  origin: >
-    Bootstrap#16372
-
 -
  browser: >
    Chrome
@ -208,6 +188,16 @@
  origin: >
    Bootstrap#17438, Bootstrap#14237

+-
+  browser: >
+    Chrome
+  summary: >
+    Clicking scrollbar in `<select multiple>` with overflowed options will select nearby `<option>`
+  upstream_bug: >
+    Chromium#597642
+  origin: >
+    Bootstrap#19810
+
 -
  browser: >
    Chrome (Windows & Linux)
@ -218,16 +208,6 @@
  origin: >
    Bootstrap#15298

-
-  browser: >
-    Safari
-  summary: >
-    `width: 1%` on nested table cell causes its table to hog horizontal space.
-  upstream_bug: >
-    WebKit#144696, Safari#20839572
-  origin: >
-    Bootstrap#16372
-
 -
  browser: >
    Safari
@ -370,6 +350,16 @@
  origin: >
    Bootstrap#14839

+-
+  browser: >
+    Safari (iOS)
+  summary: >
+    Tapping from one `<input>` to another in an overlay can cause shaking/jiggling effect
+  upstream_bug: >
+    WebKit#158276
+  origin: >
+    Bootstrap#19927
+
 -
  browser: >
    Safari (iPad Pro)
--- a/docs/assets/js/ie-emulation-modes-warning.js
+++ b/docs/assets/js/ie-emulation-modes-warning.js
@ -2,6 +2,7 @@
 // IT'S JUST JUNK FOR OUR DOCS!
 // ++++++++++++++++++++++++++++++++++++++++++
 /*!
+ * Copyright 2014-2015 The Bootstrap Authors
 * Copyright 2014-2015 Twitter, Inc.
 *
 * Licensed under the Creative Commons Attribution 3.0 Unported License. For
--- a/docs/assets/js/ie10-viewport-bug-workaround.js
+++ b/docs/assets/js/ie10-viewport-bug-workaround.js
@ -1,5 +1,6 @@
 /*!
 * IE10 viewport hack for Surface/desktop Windows 8 bug
+ * Copyright 2014-2015 The Bootstrap Authors
 * Copyright 2014-2015 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 */
--- a/docs/assets/js/src/application.js
+++ b/docs/assets/js/src/application.js
@ -4,6 +4,7 @@

 /*!
 * JavaScript for Bootstrap's docs (http://getbootstrap.com)
+ * Copyright 2011-2016 The Bootstrap Authors
 * Copyright 2011-2016 Twitter, Inc.
 * Licensed under the Creative Commons Attribution 3.0 Unported License. For
 * details, see https://creativecommons.org/licenses/by/3.0/.
@ -32,7 +33,7 @@
    $('.bd-example-indeterminate [type="checkbox"]').prop('indeterminate', true)

    // Disable empty links in docs examples
-    $('.bd-example [href=#]').click(function (e) {
+    $('.bd-example [href="#"]').click(function (e) {
      e.preventDefault()
    })

--- a/docs/assets/js/vendor/jquery.min.js
+++ b/docs/assets/js/vendor/jquery.min.js
--- a/docs/assets/scss/docs.scss
+++ b/docs/assets/scss/docs.scss
@ -1,5 +1,6 @@
 /*!
 * Bootstrap Docs (http://getbootstrap.com)
+ * Copyright 2011-2016 The Bootstrap Authors
 * Copyright 2011-2016 Twitter, Inc.
 * Licensed under the Creative Commons Attribution 3.0 Unported License. For
 * details, see https://creativecommons.org/licenses/by/3.0/.
--- a/docs/components/modal.md
+++ b/docs/components/modal.md
@ -480,10 +480,6 @@ Bootstrap's modal class exposes a few events for hooking into modal functionalit
       <td>hidden.bs.modal</td>
       <td>This event is fired when the modal has finished being hidden from the user (will wait for CSS transitions to complete).</td>
     </tr>
-     <tr>
-       <td>loaded.bs.modal</td>
-       <td>This event is fired when the modal has loaded content using the <code>remote</code> option.</td>
-     </tr>
    </tbody>
  </table>
 </div>
--- a/docs/content/reboot.md
+++ b/docs/content/reboot.md
@ -28,7 +28,7 @@ Here are our guidelines and reasons for choosing what to override in Reboot:
 The `<html>` and `<body>` elements are updated to provide better page-wide defaults. More specifically:

 - The `box-sizing` is globally set on every element—including `*:before` and `*:after`, to `border-box`. This ensures that the declared width of element is never exceeded due to padding or border.
- A base `font-size: 16px` is declared on the `<html>` and `font-size: 1rem` on the `<body>` for easy responsive type-scaling via media queryies.
+- A base `font-size: 16px` is declared on the `<html>` and `font-size: 1rem` on the `<body>` for easy responsive type-scaling via media queries.
 - The `<body>` also sets a global `font-family` and `line-height`. This is inherited later by some form elements to prevent font inconsistencies.
 - For safety, the `<body>` has a declared `background-color`, defaulting to `#fff`.

--- a/docs/examples/album/index.html
+++ b/docs/examples/album/index.html
@ -115,7 +115,7 @@
    <!-- Bootstrap core JavaScript
    ================================================== -->
    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js" integrity="sha384-mXQoED/lFIuocc//nss8aJOIrz7X7XruhR6bO+sGceiSyMELoVdZkN7F0oYwcFH+" crossorigin="anonymous"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js" integrity="sha384-rY/jv8mMhqDabXSo+UCggqKtdmBfd3qC2/KvyTDNQ6PcUJXaxK1tMepoQda4g5vB" crossorigin="anonymous"></script>
    <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js" integrity="sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB" crossorigin="anonymous"></script>
    <script src="../../assets/js/vendor/holder.min.js"></script>
--- a/docs/examples/blog/index.html
+++ b/docs/examples/blog/index.html
@ -158,7 +158,7 @@
    <!-- Bootstrap core JavaScript
    ================================================== -->
    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js" integrity="sha384-mXQoED/lFIuocc//nss8aJOIrz7X7XruhR6bO+sGceiSyMELoVdZkN7F0oYwcFH+" crossorigin="anonymous"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js" integrity="sha384-rY/jv8mMhqDabXSo+UCggqKtdmBfd3qC2/KvyTDNQ6PcUJXaxK1tMepoQda4g5vB" crossorigin="anonymous"></script>
    <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js" integrity="sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB" crossorigin="anonymous"></script>
    <script src="../../dist/js/bootstrap.min.js"></script>
--- a/docs/examples/carousel/index.html
+++ b/docs/examples/carousel/index.html
@ -174,7 +174,7 @@
    <!-- Bootstrap core JavaScript
    ================================================== -->
    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js" integrity="sha384-mXQoED/lFIuocc//nss8aJOIrz7X7XruhR6bO+sGceiSyMELoVdZkN7F0oYwcFH+" crossorigin="anonymous"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js" integrity="sha384-rY/jv8mMhqDabXSo+UCggqKtdmBfd3qC2/KvyTDNQ6PcUJXaxK1tMepoQda4g5vB" crossorigin="anonymous"></script>
    <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js" integrity="sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB" crossorigin="anonymous"></script>
    <script src="../../dist/js/bootstrap.min.js"></script>
--- a/docs/examples/cover/index.html
+++ b/docs/examples/cover/index.html
@ -60,7 +60,7 @@
    <!-- Bootstrap core JavaScript
    ================================================== -->
    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js" integrity="sha384-mXQoED/lFIuocc//nss8aJOIrz7X7XruhR6bO+sGceiSyMELoVdZkN7F0oYwcFH+" crossorigin="anonymous"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js" integrity="sha384-rY/jv8mMhqDabXSo+UCggqKtdmBfd3qC2/KvyTDNQ6PcUJXaxK1tMepoQda4g5vB" crossorigin="anonymous"></script>
    <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js" integrity="sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB" crossorigin="anonymous"></script>
    <script src="../../dist/js/bootstrap.min.js"></script>
--- a/docs/examples/dashboard/index.html
+++ b/docs/examples/dashboard/index.html
@ -224,7 +224,7 @@
    <!-- Bootstrap core JavaScript
    ================================================== -->
    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js" integrity="sha384-mXQoED/lFIuocc//nss8aJOIrz7X7XruhR6bO+sGceiSyMELoVdZkN7F0oYwcFH+" crossorigin="anonymous"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js" integrity="sha384-rY/jv8mMhqDabXSo+UCggqKtdmBfd3qC2/KvyTDNQ6PcUJXaxK1tMepoQda4g5vB" crossorigin="anonymous"></script>
    <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js" integrity="sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB" crossorigin="anonymous"></script>
    <script src="../../dist/js/bootstrap.min.js"></script>
--- a/docs/examples/jumbotron/index.html
+++ b/docs/examples/jumbotron/index.html
@ -75,7 +75,7 @@
    <!-- Bootstrap core JavaScript
    ================================================== -->
    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js" integrity="sha384-mXQoED/lFIuocc//nss8aJOIrz7X7XruhR6bO+sGceiSyMELoVdZkN7F0oYwcFH+" crossorigin="anonymous"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js" integrity="sha384-rY/jv8mMhqDabXSo+UCggqKtdmBfd3qC2/KvyTDNQ6PcUJXaxK1tMepoQda4g5vB" crossorigin="anonymous"></script>
    <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js" integrity="sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB" crossorigin="anonymous"></script>
    <script src="../../dist/js/bootstrap.min.js"></script>
--- a/docs/examples/navbar-top-fixed/index.html
+++ b/docs/examples/navbar-top-fixed/index.html
@ -45,7 +45,7 @@
    <!-- Bootstrap core JavaScript
    ================================================== -->
    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js" integrity="sha384-mXQoED/lFIuocc//nss8aJOIrz7X7XruhR6bO+sGceiSyMELoVdZkN7F0oYwcFH+" crossorigin="anonymous"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js" integrity="sha384-rY/jv8mMhqDabXSo+UCggqKtdmBfd3qC2/KvyTDNQ6PcUJXaxK1tMepoQda4g5vB" crossorigin="anonymous"></script>
    <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js" integrity="sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB" crossorigin="anonymous"></script>
    <script src="../../dist/js/bootstrap.min.js"></script>
--- a/docs/examples/navbar-top/index.html
+++ b/docs/examples/navbar-top/index.html
@ -43,7 +43,7 @@
    <!-- Bootstrap core JavaScript
    ================================================== -->
    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js" integrity="sha384-mXQoED/lFIuocc//nss8aJOIrz7X7XruhR6bO+sGceiSyMELoVdZkN7F0oYwcFH+" crossorigin="anonymous"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js" integrity="sha384-rY/jv8mMhqDabXSo+UCggqKtdmBfd3qC2/KvyTDNQ6PcUJXaxK1tMepoQda4g5vB" crossorigin="anonymous"></script>
    <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js" integrity="sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB" crossorigin="anonymous"></script>
    <script src="../../dist/js/bootstrap.min.js"></script>
--- a/docs/examples/navbar/index.html
+++ b/docs/examples/navbar/index.html
@ -64,7 +64,7 @@
    <!-- Bootstrap core JavaScript
    ================================================== -->
    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js" integrity="sha384-mXQoED/lFIuocc//nss8aJOIrz7X7XruhR6bO+sGceiSyMELoVdZkN7F0oYwcFH+" crossorigin="anonymous"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js" integrity="sha384-rY/jv8mMhqDabXSo+UCggqKtdmBfd3qC2/KvyTDNQ6PcUJXaxK1tMepoQda4g5vB" crossorigin="anonymous"></script>
    <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js" integrity="sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB" crossorigin="anonymous"></script>
    <script src="../../dist/js/bootstrap.min.js"></script>
--- a/docs/examples/offcanvas/index.html
+++ b/docs/examples/offcanvas/index.html
@ -104,7 +104,7 @@
    <!-- Bootstrap core JavaScript
    ================================================== -->
    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js" integrity="sha384-mXQoED/lFIuocc//nss8aJOIrz7X7XruhR6bO+sGceiSyMELoVdZkN7F0oYwcFH+" crossorigin="anonymous"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js" integrity="sha384-rY/jv8mMhqDabXSo+UCggqKtdmBfd3qC2/KvyTDNQ6PcUJXaxK1tMepoQda4g5vB" crossorigin="anonymous"></script>
    <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js" integrity="sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB" crossorigin="anonymous"></script>
    <script src="../../dist/js/bootstrap.min.js"></script>
--- a/docs/examples/starter-template/index.html
+++ b/docs/examples/starter-template/index.html
@ -48,7 +48,7 @@
    <!-- Bootstrap core JavaScript
    ================================================== -->
    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js" integrity="sha384-mXQoED/lFIuocc//nss8aJOIrz7X7XruhR6bO+sGceiSyMELoVdZkN7F0oYwcFH+" crossorigin="anonymous"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js" integrity="sha384-rY/jv8mMhqDabXSo+UCggqKtdmBfd3qC2/KvyTDNQ6PcUJXaxK1tMepoQda4g5vB" crossorigin="anonymous"></script>
    <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js" integrity="sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB" crossorigin="anonymous"></script>
    <script src="../../dist/js/bootstrap.min.js"></script>
--- a/docs/examples/sticky-footer-navbar/index.html
+++ b/docs/examples/sticky-footer-navbar/index.html
@ -73,7 +73,7 @@
    <!-- Bootstrap core JavaScript
    ================================================== -->
    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js" integrity="sha384-mXQoED/lFIuocc//nss8aJOIrz7X7XruhR6bO+sGceiSyMELoVdZkN7F0oYwcFH+" crossorigin="anonymous"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js" integrity="sha384-rY/jv8mMhqDabXSo+UCggqKtdmBfd3qC2/KvyTDNQ6PcUJXaxK1tMepoQda4g5vB" crossorigin="anonymous"></script>
    <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js" integrity="sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB" crossorigin="anonymous"></script>
    <script src="../../dist/js/bootstrap.min.js"></script>
--- a/docs/examples/tooltip-viewport/index.html
+++ b/docs/examples/tooltip-viewport/index.html
@ -39,7 +39,7 @@
    <!-- Bootstrap core JavaScript
    ================================================== -->
    <!-- Placed at the end of the document so the pages load faster -->
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.2/jquery.min.js" integrity="sha384-mXQoED/lFIuocc//nss8aJOIrz7X7XruhR6bO+sGceiSyMELoVdZkN7F0oYwcFH+" crossorigin="anonymous"></script>
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js" integrity="sha384-rY/jv8mMhqDabXSo+UCggqKtdmBfd3qC2/KvyTDNQ6PcUJXaxK1tMepoQda4g5vB" crossorigin="anonymous"></script>
    <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js" integrity="sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB" crossorigin="anonymous"></script>
    <script src="../../dist/js/bootstrap.min.js"></script>
--- a/docs/getting-started/browsers-devices.md
+++ b/docs/getting-started/browsers-devices.md
@ -174,6 +174,7 @@ See [this StackOverflow question](https://stackoverflow.com/questions/6771258/wh
 Internet Explorer 10 in Windows Phone 8 versions older than [Update 3 (a.k.a. GDR3)](http://blogs.windows.com/windows_phone/b/wpdev/archive/2013/10/14/introducing-windows-phone-preview-for-developers.aspx) doesn't differentiate **device width** from **viewport width** in `@-ms-viewport` at-rules, and thus doesn't properly apply the media queries in Bootstrap's CSS. To address this, you'll need to **include the following JavaScript to work around the bug**.

 {% highlight js %}
+// Copyright 2014-2015 The Bootstrap Authors
 // Copyright 2014-2015 Twitter, Inc.
 // Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 if (navigator.userAgent.match(/IEMobile\/10\.0/)) {
--- a/docs/migration.md
+++ b/docs/migration.md
@ -123,7 +123,10 @@ New to Bootstrap 4 is the Reboot, a new stylesheet that builds on Normalize with
 ### List groups

 - Replaced `a.list-group-item` with an explicit class, `.list-group-item-action`, for styling link and button versions of list group items.
-
+
+### Modal
+
+- The `remote` option (which could be used to automatically load and inject external content into a modal) and the correspending `loaded.bs.modal` event were removed. We recommend instead using client-side templating or a data binding framework, or calling [jQuery.load](http://api.jquery.com/load/) yourself.

 ### Navs

--- a/grunt/bs-commonjs-generator.js
+++ b/grunt/bs-commonjs-generator.js
@ -1,6 +1,7 @@
 /*!
 * Bootstrap Grunt task for the CommonJS module generation
 * http://getbootstrap.com
+ * Copyright 2014-2015 The Bootstrap Authors
 * Copyright 2014-2015 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 */
--- a/grunt/change-version.js
+++ b/grunt/change-version.js
@ -3,6 +3,7 @@

 /*!
 * Script to update version number references in the project.
+ * Copyright 2015 The Bootstrap Authors
 * Copyright 2015 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 */
--- a/grunt/npm-shrinkwrap.json
+++ b/grunt/npm-shrinkwrap.json
@ -17,10 +17,17 @@
      "from": "acorn@>=1.0.3 <2.0.0",
      "resolved": "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"
    },
-    "acorn-to-esprima": {
-      "version": "1.0.7",
-      "from": "acorn-to-esprima@>=1.0.5 <2.0.0",
-      "resolved": "https://registry.npmjs.org/acorn-to-esprima/-/acorn-to-esprima-1.0.7.tgz"
+    "acorn-jsx": {
+      "version": "3.0.1",
+      "from": "acorn-jsx@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
+      "dependencies": {
+        "acorn": {
+          "version": "3.1.0",
+          "from": "acorn@^3.0.4",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.1.0.tgz"
+        }
+      }
    },
    "align-text": {
      "version": "0.1.4",
@ -43,9 +50,9 @@
      "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz"
    },
    "ansi-escapes": {
-      "version": "1.3.0",
+      "version": "1.4.0",
      "from": "ansi-escapes@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.3.0.tgz"
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz"
    },
    "ansi-regex": {
      "version": "2.0.0",
@ -58,31 +65,41 @@
      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
    },
    "archiver": {
-      "version": "0.21.0",
-      "from": "archiver@>=0.21.0 <0.22.0",
-      "resolved": "https://registry.npmjs.org/archiver/-/archiver-0.21.0.tgz",
+      "version": "1.0.0",
+      "from": "archiver@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/archiver/-/archiver-1.0.0.tgz",
      "dependencies": {
        "async": {
          "version": "1.5.2",
-          "from": "async@>=1.5.0 <1.6.0",
+          "from": "async@>=1.5.0 <2.0.0",
          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
        },
        "glob": {
-          "version": "6.0.4",
-          "from": "glob@>=6.0.0 <6.1.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"
+          "version": "7.0.3",
+          "from": "glob@>=7.0.0 <8.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.3.tgz"
+        },
+        "lodash": {
+          "version": "4.13.1",
+          "from": "lodash@>=4.8.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"
        }
      }
    },
    "archiver-utils": {
-      "version": "0.3.0",
-      "from": "archiver-utils@>=0.3.0 <0.4.0",
-      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-0.3.0.tgz",
+      "version": "1.2.0",
+      "from": "archiver-utils@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-1.2.0.tgz",
      "dependencies": {
        "glob": {
-          "version": "6.0.4",
-          "from": "glob@>=6.0.0 <6.1.0",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"
+          "version": "7.0.3",
+          "from": "glob@>=7.0.0 <8.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.3.tgz"
+        },
+        "lodash": {
+          "version": "4.13.1",
+          "from": "lodash@>=4.8.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"
        }
      }
    },
@ -178,21 +195,55 @@
      "from": "aws-sign2@>=0.6.0 <0.7.0",
      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"
    },
+    "babel-code-frame": {
+      "version": "6.8.0",
+      "from": "babel-code-frame@>=6.8.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.8.0.tgz",
+      "dependencies": {
+        "js-tokens": {
+          "version": "1.0.3",
+          "from": "js-tokens@>=1.0.2 <2.0.0",
+          "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-1.0.3.tgz"
+        }
+      }
+    },
    "babel-core": {
      "version": "5.8.38",
      "from": "babel-core@>=5.8.33 <6.0.0",
      "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-5.8.38.tgz"
    },
    "babel-eslint": {
-      "version": "4.1.8",
-      "from": "babel-eslint@>=4.1.3 <5.0.0",
-      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-4.1.8.tgz"
+      "version": "6.0.4",
+      "from": "babel-eslint@6.0.4",
+      "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-6.0.4.tgz",
+      "dependencies": {
+        "babylon": {
+          "version": "6.8.0",
+          "from": "babylon@>=6.0.18 <7.0.0",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.8.0.tgz"
+        },
+        "lodash.assign": {
+          "version": "4.0.9",
+          "from": "lodash.assign@>=4.0.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.0.9.tgz"
+        },
+        "lodash.keys": {
+          "version": "4.0.7",
+          "from": "lodash.keys@>=4.0.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-4.0.7.tgz"
+        }
+      }
    },
    "babel-jscs": {
      "version": "2.0.5",
      "from": "babel-jscs@>=2.0.0 <3.0.0",
      "resolved": "https://registry.npmjs.org/babel-jscs/-/babel-jscs-2.0.5.tgz"
    },
+    "babel-messages": {
+      "version": "6.8.0",
+      "from": "babel-messages@>=6.8.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.8.0.tgz"
+    },
    "babel-plugin-constant-folding": {
      "version": "1.0.1",
      "from": "babel-plugin-constant-folding@>=1.0.1 <2.0.0",
@ -268,20 +319,66 @@
      "from": "babel-plugin-undefined-to-void@>=1.1.6 <2.0.0",
      "resolved": "https://registry.npmjs.org/babel-plugin-undefined-to-void/-/babel-plugin-undefined-to-void-1.1.6.tgz"
    },
+    "babel-runtime": {
+      "version": "6.9.2",
+      "from": "babel-runtime@>=6.9.0 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.9.2.tgz",
+      "dependencies": {
+        "core-js": {
+          "version": "2.4.0",
+          "from": "core-js@>=2.4.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.4.0.tgz"
+        }
+      }
+    },
+    "babel-traverse": {
+      "version": "6.9.0",
+      "from": "babel-traverse@>=6.0.20 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.9.0.tgz",
+      "dependencies": {
+        "babylon": {
+          "version": "6.8.0",
+          "from": "babylon@^6.7.0",
+          "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.8.0.tgz"
+        },
+        "globals": {
+          "version": "8.18.0",
+          "from": "globals@>=8.3.0 <9.0.0",
+          "resolved": "https://registry.npmjs.org/globals/-/globals-8.18.0.tgz"
+        },
+        "lodash": {
+          "version": "4.13.1",
+          "from": "lodash@>=4.2.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"
+        }
+      }
+    },
+    "babel-types": {
+      "version": "6.9.1",
+      "from": "babel-types@>=6.0.19 <7.0.0",
+      "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.9.1.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "4.13.1",
+          "from": "lodash@^4.2.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"
+        }
+      }
+    },
    "babylon": {
      "version": "5.8.38",
      "from": "babylon@>=5.8.38 <6.0.0",
      "resolved": "https://registry.npmjs.org/babylon/-/babylon-5.8.38.tgz"
    },
    "balanced-match": {
-      "version": "0.3.0",
-      "from": "balanced-match@>=0.3.0 <0.4.0",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz"
+      "version": "0.4.1",
+      "from": "balanced-match@>=0.4.1 <0.5.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.1.tgz"
    },
    "basic-auth": {
-      "version": "1.0.3",
+      "version": "1.0.4",
      "from": "basic-auth@>=1.0.3 <1.1.0",
-      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.3.tgz"
+      "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"
    },
    "batch": {
      "version": "0.5.3",
@ -291,12 +388,19 @@
    "bl": {
      "version": "1.1.2",
      "from": "bl@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz"
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.0.6",
+          "from": "readable-stream@>=2.0.5 <2.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+        }
+      }
    },
    "block-stream": {
-      "version": "0.0.8",
+      "version": "0.0.9",
      "from": "block-stream@*",
-      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.8.tgz"
+      "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz"
    },
    "bluebird": {
      "version": "2.10.2",
@ -314,9 +418,9 @@
      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"
    },
    "brace-expansion": {
-      "version": "1.1.3",
+      "version": "1.1.4",
      "from": "brace-expansion@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.3.tgz"
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.4.tgz"
    },
    "breakable": {
      "version": "1.0.0",
@ -338,6 +442,11 @@
      "from": "buffer-crc32@>=0.2.1 <0.3.0",
      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz"
    },
+    "buffer-shims": {
+      "version": "1.0.0",
+      "from": "buffer-shims@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"
+    },
    "builtin-modules": {
      "version": "1.1.1",
      "from": "builtin-modules@>=1.0.0 <2.0.0",
@ -348,6 +457,16 @@
      "from": "bytes@2.2.0",
      "resolved": "https://registry.npmjs.org/bytes/-/bytes-2.2.0.tgz"
    },
+    "caller-path": {
+      "version": "0.1.0",
+      "from": "caller-path@>=0.1.0 <0.2.0",
+      "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz"
+    },
+    "callsites": {
+      "version": "0.2.0",
+      "from": "callsites@>=0.2.0 <0.3.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz"
+    },
    "camelcase": {
      "version": "1.2.1",
      "from": "camelcase@>=1.2.1 <2.0.0",
@ -366,9 +485,9 @@
      }
    },
    "caniuse-db": {
-      "version": "1.0.30000449",
+      "version": "1.0.30000471",
      "from": "caniuse-db@>=1.0.30000444 <2.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000449.tgz"
+      "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000471.tgz"
    },
    "caseless": {
      "version": "0.11.0",
@ -393,9 +512,9 @@
      }
    },
    "clean-css": {
-      "version": "3.4.12",
+      "version": "3.4.13",
      "from": "clean-css@>=3.4.2 <3.5.0",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.12.tgz",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.13.tgz",
      "dependencies": {
        "commander": {
          "version": "2.8.1",
@ -427,9 +546,9 @@
      }
    },
    "cli-width": {
-      "version": "1.1.1",
-      "from": "cli-width@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-1.1.1.tgz"
+      "version": "2.1.0",
+      "from": "cli-width@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.1.0.tgz"
    },
    "cliui": {
      "version": "2.1.0",
@ -472,9 +591,9 @@
      "resolved": "https://registry.npmjs.org/commoner/-/commoner-0.10.4.tgz"
    },
    "compress-commons": {
-      "version": "0.4.2",
-      "from": "compress-commons@>=0.4.0 <0.5.0",
-      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-0.4.2.tgz"
+      "version": "1.0.0",
+      "from": "compress-commons@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-1.0.0.tgz"
    },
    "concat-map": {
      "version": "0.0.1",
@ -484,12 +603,14 @@
    "concat-stream": {
      "version": "1.5.1",
      "from": "concat-stream@>=1.4.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz"
-    },
-    "config-chain": {
-      "version": "1.1.10",
-      "from": "config-chain@>=1.1.8 <1.2.0",
-      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.10.tgz"
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.5.1.tgz",
+      "dependencies": {
+        "readable-stream": {
+          "version": "2.0.6",
+          "from": "readable-stream@>=2.0.0 <2.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
+        }
+      }
    },
    "connect": {
      "version": "3.4.1",
@ -502,9 +623,9 @@
      "resolved": "https://registry.npmjs.org/connect-livereload/-/connect-livereload-0.5.4.tgz"
    },
    "content-type": {
-      "version": "1.0.1",
+      "version": "1.0.2",
      "from": "content-type@>=1.0.1 <1.1.0",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.1.tgz"
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz"
    },
    "convert-source-map": {
      "version": "1.2.0",
@ -527,9 +648,9 @@
      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
    },
    "crc32-stream": {
-      "version": "0.4.0",
-      "from": "crc32-stream@>=0.4.0 <0.5.0",
-      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-0.4.0.tgz"
+      "version": "1.0.0",
+      "from": "crc32-stream@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-1.0.0.tgz"
    },
    "cross-spawn": {
      "version": "0.2.9",
@ -537,9 +658,9 @@
      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-0.2.9.tgz"
    },
    "cross-spawn-async": {
-      "version": "2.2.1",
-      "from": "cross-spawn-async@>=2.2.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.1.tgz",
+      "version": "2.2.4",
+      "from": "cross-spawn-async@>=2.1.9 <3.0.0",
+      "resolved": "https://registry.npmjs.org/cross-spawn-async/-/cross-spawn-async-2.2.4.tgz",
      "dependencies": {
        "lru-cache": {
          "version": "4.0.1",
@ -547,9 +668,9 @@
          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.1.tgz"
        },
        "which": {
-          "version": "1.2.4",
-          "from": "which@>=1.2.4 <2.0.0",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.2.4.tgz"
+          "version": "1.2.9",
+          "from": "which@>=1.2.8 <2.0.0",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.2.9.tgz"
        }
      }
    },
@ -584,9 +705,9 @@
      "resolved": "https://registry.npmjs.org/dargs/-/dargs-4.1.0.tgz"
    },
    "dashdash": {
-      "version": "1.13.0",
-      "from": "dashdash@>=1.10.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.13.0.tgz",
+      "version": "1.13.1",
+      "from": "dashdash@>=1.12.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.13.1.tgz",
      "dependencies": {
        "assert-plus": {
          "version": "1.0.0",
@ -676,9 +797,9 @@
      "resolved": "https://registry.npmjs.org/diff/-/diff-2.2.2.tgz"
    },
    "doctrine": {
-      "version": "0.7.2",
-      "from": "doctrine@>=0.7.1 <0.8.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz",
+      "version": "1.2.2",
+      "from": "doctrine@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.2.2.tgz",
      "dependencies": {
        "esutils": {
          "version": "1.1.6",
@ -726,7 +847,7 @@
    },
    "ecc-jsbn": {
      "version": "0.1.1",
-      "from": "ecc-jsbn@>=0.0.1 <1.0.0",
+      "from": "ecc-jsbn@>=0.1.1 <0.2.0",
      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"
    },
    "ee-first": {
@ -795,19 +916,24 @@
      "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz"
    },
    "eslint": {
-      "version": "1.10.3",
-      "from": "eslint@>=1.5.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-1.10.3.tgz",
+      "version": "2.2.0",
+      "from": "eslint@2.2.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-2.2.0.tgz",
      "dependencies": {
        "argparse": {
          "version": "1.0.7",
          "from": "argparse@>=1.0.2 <2.0.0",
          "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.7.tgz"
        },
-        "espree": {
-          "version": "2.2.5",
-          "from": "espree@>=2.2.4 <3.0.0",
-          "resolved": "https://registry.npmjs.org/espree/-/espree-2.2.5.tgz"
+        "esprima": {
+          "version": "2.7.2",
+          "from": "esprima@>=2.6.0 <3.0.0",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.2.tgz"
+        },
+        "glob": {
+          "version": "6.0.4",
+          "from": "glob@>=6.0.4 <7.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"
        },
        "globals": {
          "version": "8.18.0",
@ -815,20 +941,14 @@
          "resolved": "https://registry.npmjs.org/globals/-/globals-8.18.0.tgz"
        },
        "js-yaml": {
-          "version": "3.4.5",
-          "from": "js-yaml@3.4.5",
-          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.4.5.tgz",
-          "dependencies": {
-            "esprima": {
-              "version": "2.7.2",
-              "from": "esprima@>=2.6.0 <3.0.0"
-            }
-          }
+          "version": "3.6.1",
+          "from": "js-yaml@>=3.5.1 <4.0.0",
+          "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz"
        },
-        "minimatch": {
-          "version": "3.0.0",
-          "from": "minimatch@>=3.0.0 <4.0.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz"
+        "lodash": {
+          "version": "4.13.1",
+          "from": "lodash@>=4.0.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"
        },
        "shelljs": {
          "version": "0.5.3",
@ -842,6 +962,18 @@
        }
      }
    },
+    "espree": {
+      "version": "3.1.5",
+      "from": "espree@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-3.1.5.tgz",
+      "dependencies": {
+        "acorn": {
+          "version": "3.1.0",
+          "from": "acorn@>=3.1.0 <4.0.0",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.1.0.tgz"
+        }
+      }
+    },
    "esprima-fb": {
      "version": "15001.1001.0-dev-harmony-fb",
      "from": "esprima-fb@>=15001.1001.0-dev-harmony-fb <15001.1002.0",
@ -928,6 +1060,11 @@
          "version": "0.5.0",
          "from": "mkdirp@0.5.0",
          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz"
+        },
+        "readable-stream": {
+          "version": "2.0.6",
+          "from": "readable-stream@>=2.0.0 <2.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
        }
      }
    },
@ -942,9 +1079,9 @@
      "resolved": "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"
    },
    "fast-levenshtein": {
-      "version": "1.0.7",
-      "from": "fast-levenshtein@>=1.0.6 <1.1.0",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.7.tgz"
+      "version": "1.1.3",
+      "from": "fast-levenshtein@>=1.1.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.3.tgz"
    },
    "faye-websocket": {
      "version": "0.10.0",
@ -974,9 +1111,9 @@
      }
    },
    "figures": {
-      "version": "1.5.0",
+      "version": "1.7.0",
      "from": "figures@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-1.5.0.tgz"
+      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz"
    },
    "file-entry-cache": {
      "version": "1.2.4",
@ -1065,9 +1202,9 @@
      "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz"
    },
    "fstream": {
-      "version": "1.0.8",
+      "version": "1.0.9",
      "from": "fstream@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.8.tgz"
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.9.tgz"
    },
    "gauge": {
      "version": "1.2.7",
@ -1099,6 +1236,18 @@
      "from": "getobject@>=0.1.0 <0.2.0",
      "resolved": "https://registry.npmjs.org/getobject/-/getobject-0.1.0.tgz"
    },
+    "getpass": {
+      "version": "0.1.6",
+      "from": "getpass@>=0.1.1 <0.2.0",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz",
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "from": "assert-plus@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+        }
+      }
+    },
    "glob": {
      "version": "5.0.15",
      "from": "glob@>=5.0.15 <6.0.0",
@ -1110,9 +1259,9 @@
      "resolved": "https://registry.npmjs.org/globals/-/globals-6.4.1.tgz"
    },
    "globby": {
-      "version": "4.0.0",
+      "version": "4.1.0",
      "from": "globby@>=4.0.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-4.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-4.1.0.tgz",
      "dependencies": {
        "glob": {
          "version": "6.0.4",
@ -1151,9 +1300,9 @@
      }
    },
    "graceful-fs": {
-      "version": "4.1.3",
+      "version": "4.1.4",
      "from": "graceful-fs@>=4.1.2 <5.0.0",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.3.tgz"
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.4.tgz"
    },
    "graceful-readlink": {
      "version": "1.0.1",
@ -1208,9 +1357,9 @@
      "resolved": "https://registry.npmjs.org/grunt-build-control/-/grunt-build-control-0.6.3.tgz",
      "dependencies": {
        "bluebird": {
-          "version": "3.3.4",
+          "version": "3.4.0",
          "from": "bluebird@>=3.0.6 <4.0.0",
-          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.3.4.tgz"
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.0.tgz"
        },
        "shelljs": {
          "version": "0.2.6",
@ -1242,26 +1391,26 @@
      }
    },
    "grunt-contrib-compress": {
-      "version": "1.2.0",
+      "version": "1.3.0",
      "from": "grunt-contrib-compress@>=1.1.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/grunt-contrib-compress/-/grunt-contrib-compress-1.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-compress/-/grunt-contrib-compress-1.3.0.tgz",
      "dependencies": {
        "lodash": {
-          "version": "4.10.0",
+          "version": "4.13.1",
          "from": "lodash@>=4.7.0 <5.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.10.0.tgz"
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"
        }
      }
    },
    "grunt-contrib-concat": {
-      "version": "1.0.0",
+      "version": "1.0.1",
      "from": "grunt-contrib-concat@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-1.0.0.tgz"
+      "resolved": "https://registry.npmjs.org/grunt-contrib-concat/-/grunt-contrib-concat-1.0.1.tgz"
    },
    "grunt-contrib-connect": {
-      "version": "1.0.1",
+      "version": "1.0.2",
      "from": "grunt-contrib-connect@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/grunt-contrib-connect/-/grunt-contrib-connect-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/grunt-contrib-connect/-/grunt-contrib-connect-1.0.2.tgz",
      "dependencies": {
        "async": {
          "version": "1.5.2",
@ -1281,9 +1430,9 @@
      "resolved": "https://registry.npmjs.org/grunt-contrib-cssmin/-/grunt-contrib-cssmin-1.0.1.tgz"
    },
    "grunt-contrib-qunit": {
-      "version": "1.1.0",
+      "version": "1.2.0",
      "from": "grunt-contrib-qunit@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/grunt-contrib-qunit/-/grunt-contrib-qunit-1.1.0.tgz"
+      "resolved": "https://registry.npmjs.org/grunt-contrib-qunit/-/grunt-contrib-qunit-1.2.0.tgz"
    },
    "grunt-contrib-sass": {
      "version": "1.0.0",
@ -1303,9 +1452,9 @@
      "resolved": "https://registry.npmjs.org/grunt-contrib-uglify/-/grunt-contrib-uglify-1.0.1.tgz",
      "dependencies": {
        "lodash": {
-          "version": "4.10.0",
+          "version": "4.13.1",
          "from": "lodash@>=4.0.1 <5.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.10.0.tgz"
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"
        }
      }
    },
@ -1321,15 +1470,10 @@
        }
      }
    },
-    "grunt-eslint": {
-      "version": "17.3.2",
-      "from": "grunt-eslint@>=17.1.0 <18.0.0",
-      "resolved": "https://registry.npmjs.org/grunt-eslint/-/grunt-eslint-17.3.2.tgz"
-    },
    "grunt-exec": {
-      "version": "0.4.6",
+      "version": "0.4.7",
      "from": "grunt-exec@>=0.4.6 <0.5.0",
-      "resolved": "https://registry.npmjs.org/grunt-exec/-/grunt-exec-0.4.6.tgz"
+      "resolved": "https://registry.npmjs.org/grunt-exec/-/grunt-exec-0.4.7.tgz"
    },
    "grunt-html": {
      "version": "7.0.0",
@ -1417,9 +1561,26 @@
      }
    },
    "grunt-lib-phantomjs": {
-      "version": "1.0.1",
+      "version": "1.1.0",
      "from": "grunt-lib-phantomjs@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/grunt-lib-phantomjs/-/grunt-lib-phantomjs-1.0.1.tgz"
+      "resolved": "https://registry.npmjs.org/grunt-lib-phantomjs/-/grunt-lib-phantomjs-1.1.0.tgz",
+      "dependencies": {
+        "glob": {
+          "version": "7.0.3",
+          "from": "glob@>=7.0.0 <8.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.3.tgz"
+        },
+        "rimraf": {
+          "version": "2.5.2",
+          "from": "rimraf@>=2.5.2 <3.0.0",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.5.2.tgz"
+        },
+        "semver": {
+          "version": "5.1.0",
+          "from": "semver@>=5.1.0 <6.0.0",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-5.1.0.tgz"
+        }
+      }
    },
    "grunt-postcss": {
      "version": "0.8.0",
@ -1427,9 +1588,9 @@
      "resolved": "https://registry.npmjs.org/grunt-postcss/-/grunt-postcss-0.8.0.tgz"
    },
    "grunt-sass": {
-      "version": "1.1.0",
+      "version": "1.2.0",
      "from": "grunt-sass@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/grunt-sass/-/grunt-sass-1.1.0.tgz"
+      "resolved": "https://registry.npmjs.org/grunt-sass/-/grunt-sass-1.2.0.tgz"
    },
    "grunt-saucelabs": {
      "version": "8.6.2",
@ -1459,9 +1620,9 @@
      "resolved": "https://registry.npmjs.org/grunt-scss-lint/-/grunt-scss-lint-0.3.8.tgz",
      "dependencies": {
        "which": {
-          "version": "1.2.4",
+          "version": "1.2.9",
          "from": "which@>=1.1.1 <2.0.0",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.2.4.tgz"
+          "resolved": "https://registry.npmjs.org/which/-/which-1.2.9.tgz"
        },
        "xmlbuilder": {
          "version": "2.6.5",
@ -1480,23 +1641,6 @@
      "from": "gzip-size@>=1.0.0 <2.0.0",
      "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-1.0.0.tgz"
    },
-    "handlebars": {
-      "version": "4.0.5",
-      "from": "handlebars@>=4.0.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.0.5.tgz",
-      "dependencies": {
-        "async": {
-          "version": "1.5.2",
-          "from": "async@>=1.4.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz"
-        },
-        "source-map": {
-          "version": "0.4.4",
-          "from": "source-map@>=0.4.4 <0.5.0",
-          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"
-        }
-      }
-    },
    "har-validator": {
      "version": "2.0.6",
      "from": "har-validator@>=2.0.2 <2.1.0",
@ -1548,19 +1692,24 @@
      "resolved": "https://registry.npmjs.org/hooker/-/hooker-0.2.3.tgz"
    },
    "hosted-git-info": {
-      "version": "2.1.4",
+      "version": "2.1.5",
      "from": "hosted-git-info@>=2.1.4 <3.0.0",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.4.tgz"
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.1.5.tgz"
    },
    "htmlparser2": {
      "version": "3.8.3",
      "from": "htmlparser2@3.8.3",
      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz",
      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "from": "isarray@0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+        },
        "readable-stream": {
-          "version": "1.1.13",
+          "version": "1.1.14",
          "from": "readable-stream@>=1.1.0 <1.2.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.13.tgz"
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"
        }
      }
    },
@ -1575,20 +1724,30 @@
      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"
    },
    "http2": {
-      "version": "3.3.2",
-      "from": "git+https://github.com/gruntjs/node-http2.git#fix-return-value",
-      "resolved": "git+https://github.com/gruntjs/node-http2.git#f1fc002c1aef9b4e871c808fc5ddacdeb1a5cd94"
+      "version": "3.3.4",
+      "from": "http2@>=3.3.4 <4.0.0",
+      "resolved": "https://registry.npmjs.org/http2/-/http2-3.3.4.tgz"
    },
    "i": {
-      "version": "0.3.4",
+      "version": "0.3.5",
      "from": "i@>=0.3.0 <0.4.0",
-      "resolved": "https://registry.npmjs.org/i/-/i-0.3.4.tgz"
+      "resolved": "https://registry.npmjs.org/i/-/i-0.3.5.tgz"
    },
    "iconv-lite": {
      "version": "0.4.13",
      "from": "iconv-lite@>=0.4.5 <0.5.0",
      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"
    },
+    "ignore": {
+      "version": "2.2.19",
+      "from": "ignore@>=2.2.19 <3.0.0",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-2.2.19.tgz"
+    },
+    "in-publish": {
+      "version": "2.0.0",
+      "from": "in-publish@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/in-publish/-/in-publish-2.0.0.tgz"
+    },
    "indent-string": {
      "version": "2.1.0",
      "from": "indent-string@>=2.1.0 <3.0.0",
@ -1602,9 +1761,9 @@
      }
    },
    "inflight": {
-      "version": "1.0.4",
+      "version": "1.0.5",
      "from": "inflight@>=1.0.4 <2.0.0",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.4.tgz"
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.5.tgz"
    },
    "inherit": {
      "version": "2.2.3",
@ -1616,26 +1775,28 @@
      "from": "inherits@>=2.0.0 <3.0.0",
      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"
    },
-    "ini": {
-      "version": "1.3.4",
-      "from": "ini@>=1.2.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.4.tgz"
-    },
    "inquirer": {
-      "version": "0.11.4",
-      "from": "inquirer@>=0.11.0 <0.12.0",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.11.4.tgz"
+      "version": "0.12.0",
+      "from": "inquirer@>=0.12.0 <0.13.0",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "4.13.1",
+          "from": "lodash@^4.3.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"
+        }
+      }
+    },
+    "invariant": {
+      "version": "2.2.1",
+      "from": "invariant@>=2.2.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.1.tgz"
    },
    "invert-kv": {
      "version": "1.0.0",
      "from": "invert-kv@>=1.0.0 <2.0.0",
      "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"
    },
-    "is-absolute": {
-      "version": "0.1.7",
-      "from": "is-absolute@>=0.1.7 <0.2.0",
-      "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-0.1.7.tgz"
-    },
    "is-arrayish": {
      "version": "0.2.1",
      "from": "is-arrayish@>=0.2.1 <0.3.0",
@ -1691,20 +1852,15 @@
      "from": "is-property@>=1.0.0 <2.0.0",
      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz"
    },
-    "is-relative": {
-      "version": "0.1.3",
-      "from": "is-relative@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-0.1.3.tgz"
-    },
    "is-resolvable": {
      "version": "1.0.0",
      "from": "is-resolvable@>=1.0.0 <2.0.0",
      "resolved": "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.0.0.tgz"
    },
    "is-stream": {
-      "version": "1.0.1",
+      "version": "1.1.0",
      "from": "is-stream@>=1.0.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.0.1.tgz"
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"
    },
    "is-travis": {
      "version": "1.0.0",
@ -1722,9 +1878,9 @@
      "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"
    },
    "isarray": {
-      "version": "0.0.1",
-      "from": "isarray@0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+      "version": "1.0.0",
+      "from": "isarray@>=1.0.0 <1.1.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
    },
    "isexe": {
      "version": "1.1.2",
@ -1742,9 +1898,9 @@
      "resolved": "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"
    },
    "jquery": {
-      "version": "2.2.3",
+      "version": "2.2.4",
      "from": "jquery@>=1.9.1 <3.0.0",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.3.tgz"
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz"
    },
    "js-base64": {
      "version": "2.1.9",
@ -1785,7 +1941,8 @@
        },
        "esprima": {
          "version": "2.7.2",
-          "from": "esprima@>=2.7.0 <2.8.0"
+          "from": "esprima@~2.7.0",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.2.tgz"
        },
        "js-yaml": {
          "version": "3.4.6",
@ -1840,9 +1997,9 @@
      "resolved": "https://registry.npmjs.org/json5/-/json5-0.4.0.tgz"
    },
    "jsonfile": {
-      "version": "2.2.3",
+      "version": "2.3.1",
      "from": "jsonfile@>=2.1.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.2.3.tgz"
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.3.1.tgz"
    },
    "jsonify": {
      "version": "0.0.0",
@ -1875,31 +2032,24 @@
      "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz"
    },
    "kind-of": {
-      "version": "3.0.2",
+      "version": "3.0.3",
      "from": "kind-of@>=3.0.2 <4.0.0",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.2.tgz"
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.0.3.tgz"
    },
    "klaw": {
-      "version": "1.1.3",
+      "version": "1.2.0",
      "from": "klaw@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.1.3.tgz"
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.2.0.tgz"
    },
    "lazy-cache": {
-      "version": "1.0.3",
+      "version": "1.0.4",
      "from": "lazy-cache@>=1.0.3 <2.0.0",
-      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.3.tgz"
+      "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"
    },
    "lazystream": {
-      "version": "0.1.0",
-      "from": "lazystream@>=0.1.0 <0.2.0",
-      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-0.1.0.tgz",
-      "dependencies": {
-        "readable-stream": {
-          "version": "1.0.33",
-          "from": "readable-stream@>=1.0.2 <1.1.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"
-        }
-      }
+      "version": "1.0.0",
+      "from": "lazystream@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz"
    },
    "lcid": {
      "version": "1.0.0",
@ -1912,9 +2062,9 @@
      "resolved": "https://registry.npmjs.org/leven/-/leven-1.0.2.tgz"
    },
    "levn": {
-      "version": "0.2.5",
-      "from": "levn@>=0.2.5 <0.3.0",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.2.5.tgz"
+      "version": "0.3.0",
+      "from": "levn@>=0.3.0 <0.4.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"
    },
    "livereload-js": {
      "version": "2.2.2",
@ -1936,81 +2086,41 @@
      "from": "lodash@>=3.10.0 <4.0.0",
      "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz"
    },
-    "lodash._arraycopy": {
-      "version": "3.0.0",
-      "from": "lodash._arraycopy@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz"
-    },
-    "lodash._arrayeach": {
-      "version": "3.0.0",
-      "from": "lodash._arrayeach@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._arrayeach/-/lodash._arrayeach-3.0.0.tgz"
-    },
-    "lodash._arraymap": {
-      "version": "3.0.0",
-      "from": "lodash._arraymap@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._arraymap/-/lodash._arraymap-3.0.0.tgz"
-    },
    "lodash._baseassign": {
      "version": "3.2.0",
      "from": "lodash._baseassign@>=3.0.0 <4.0.0",
      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz"
    },
-    "lodash._baseclone": {
-      "version": "3.3.0",
-      "from": "lodash._baseclone@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseclone/-/lodash._baseclone-3.3.0.tgz"
-    },
    "lodash._basecopy": {
      "version": "3.0.1",
      "from": "lodash._basecopy@>=3.0.0 <4.0.0",
      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
    },
-    "lodash._basedifference": {
-      "version": "3.0.3",
-      "from": "lodash._basedifference@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._basedifference/-/lodash._basedifference-3.0.3.tgz"
-    },
-    "lodash._baseflatten": {
-      "version": "3.1.4",
-      "from": "lodash._baseflatten@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseflatten/-/lodash._baseflatten-3.1.4.tgz"
-    },
-    "lodash._basefor": {
-      "version": "3.0.3",
-      "from": "lodash._basefor@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._basefor/-/lodash._basefor-3.0.3.tgz"
-    },
-    "lodash._baseindexof": {
-      "version": "3.1.0",
-      "from": "lodash._baseindexof@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz"
+    "lodash._baseiteratee": {
+      "version": "4.7.0",
+      "from": "lodash._baseiteratee@>=4.7.0 <4.8.0",
+      "resolved": "https://registry.npmjs.org/lodash._baseiteratee/-/lodash._baseiteratee-4.7.0.tgz"
    },
    "lodash._baseslice": {
      "version": "4.0.0",
      "from": "lodash._baseslice@>=4.0.0 <4.1.0",
      "resolved": "https://registry.npmjs.org/lodash._baseslice/-/lodash._baseslice-4.0.0.tgz"
    },
+    "lodash._basetostring": {
+      "version": "4.12.0",
+      "from": "lodash._basetostring@>=4.12.0 <4.13.0",
+      "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-4.12.0.tgz"
+    },
    "lodash._bindcallback": {
      "version": "3.0.1",
      "from": "lodash._bindcallback@>=3.0.0 <4.0.0",
      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz"
    },
-    "lodash._cacheindexof": {
-      "version": "3.0.2",
-      "from": "lodash._cacheindexof@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz"
-    },
    "lodash._createassigner": {
      "version": "3.1.1",
      "from": "lodash._createassigner@>=3.0.0 <4.0.0",
      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz"
    },
-    "lodash._createcache": {
-      "version": "3.1.2",
-      "from": "lodash._createcache@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._createcache/-/lodash._createcache-3.1.2.tgz"
-    },
    "lodash._getnative": {
      "version": "3.9.1",
      "from": "lodash._getnative@>=3.0.0 <4.0.0",
@ -2021,26 +2131,16 @@
      "from": "lodash._isiterateecall@>=3.0.0 <4.0.0",
      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
    },
-    "lodash._pickbyarray": {
-      "version": "3.0.2",
-      "from": "lodash._pickbyarray@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._pickbyarray/-/lodash._pickbyarray-3.0.2.tgz"
-    },
-    "lodash._pickbycallback": {
-      "version": "3.0.0",
-      "from": "lodash._pickbycallback@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash._pickbycallback/-/lodash._pickbycallback-3.0.0.tgz"
+    "lodash._stringtopath": {
+      "version": "4.8.0",
+      "from": "lodash._stringtopath@>=4.8.0 <4.9.0",
+      "resolved": "https://registry.npmjs.org/lodash._stringtopath/-/lodash._stringtopath-4.8.0.tgz"
    },
    "lodash.assign": {
      "version": "3.2.0",
      "from": "lodash.assign@>=3.2.0 <4.0.0",
      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz"
    },
-    "lodash.clonedeep": {
-      "version": "3.0.2",
-      "from": "lodash.clonedeep@>=3.0.1 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-3.0.2.tgz"
-    },
    "lodash.isarguments": {
      "version": "3.0.8",
      "from": "lodash.isarguments@>=3.0.0 <4.0.0",
@ -2051,76 +2151,61 @@
      "from": "lodash.isarray@>=3.0.0 <4.0.0",
      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
    },
-    "lodash.isplainobject": {
-      "version": "3.2.0",
-      "from": "lodash.isplainobject@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz"
-    },
-    "lodash.istypedarray": {
-      "version": "3.0.6",
-      "from": "lodash.istypedarray@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz"
-    },
    "lodash.keys": {
      "version": "3.1.2",
      "from": "lodash.keys@>=3.0.0 <4.0.0",
      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz"
    },
    "lodash.keysin": {
-      "version": "3.0.8",
-      "from": "lodash.keysin@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.keysin/-/lodash.keysin-3.0.8.tgz"
-    },
-    "lodash.merge": {
-      "version": "3.3.2",
-      "from": "lodash.merge@>=3.3.2 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-3.3.2.tgz"
-    },
-    "lodash.omit": {
-      "version": "3.1.0",
-      "from": "lodash.omit@>=3.1.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-3.1.0.tgz"
+      "version": "4.1.4",
+      "from": "lodash.keysin@>=4.0.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.keysin/-/lodash.keysin-4.1.4.tgz"
    },
    "lodash.pad": {
-      "version": "4.3.0",
+      "version": "4.4.0",
      "from": "lodash.pad@>=4.1.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.3.0.tgz"
+      "resolved": "https://registry.npmjs.org/lodash.pad/-/lodash.pad-4.4.0.tgz"
    },
    "lodash.padend": {
-      "version": "4.4.0",
+      "version": "4.5.0",
      "from": "lodash.padend@>=4.1.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.4.0.tgz"
+      "resolved": "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.5.0.tgz"
    },
    "lodash.padstart": {
-      "version": "4.4.0",
+      "version": "4.5.0",
      "from": "lodash.padstart@>=4.1.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.4.0.tgz"
+      "resolved": "https://registry.npmjs.org/lodash.padstart/-/lodash.padstart-4.5.0.tgz"
    },
-    "lodash.pick": {
-      "version": "3.1.0",
-      "from": "lodash.pick@>=3.1.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.pick/-/lodash.pick-3.1.0.tgz"
+    "lodash.pickby": {
+      "version": "4.4.0",
+      "from": "lodash.pickby@>=4.0.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.pickby/-/lodash.pickby-4.4.0.tgz"
+    },
+    "lodash.rest": {
+      "version": "4.0.3",
+      "from": "lodash.rest@>=4.0.0 <5.0.0",
+      "resolved": "https://registry.npmjs.org/lodash.rest/-/lodash.rest-4.0.3.tgz"
    },
    "lodash.restparam": {
      "version": "3.6.1",
      "from": "lodash.restparam@>=3.0.0 <4.0.0",
      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
    },
-    "lodash.toplainobject": {
-      "version": "3.0.0",
-      "from": "lodash.toplainobject@>=3.0.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz"
-    },
    "lodash.tostring": {
-      "version": "4.1.2",
+      "version": "4.1.3",
      "from": "lodash.tostring@>=4.0.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/lodash.tostring/-/lodash.tostring-4.1.2.tgz"
+      "resolved": "https://registry.npmjs.org/lodash.tostring/-/lodash.tostring-4.1.3.tgz"
    },
    "longest": {
      "version": "1.0.1",
      "from": "longest@>=1.0.1 <2.0.0",
      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"
    },
+    "loose-envify": {
+      "version": "1.2.0",
+      "from": "loose-envify@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.2.0.tgz"
+    },
    "loud-rejection": {
      "version": "1.3.0",
      "from": "loud-rejection@>=1.0.0 <2.0.0",
@ -2164,14 +2249,14 @@
      "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"
    },
    "mime-db": {
-      "version": "1.22.0",
-      "from": "mime-db@>=1.22.0 <1.23.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.22.0.tgz"
+      "version": "1.23.0",
+      "from": "mime-db@>=1.23.0 <1.24.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.23.0.tgz"
    },
    "mime-types": {
-      "version": "2.1.10",
+      "version": "2.1.11",
      "from": "mime-types@>=2.1.9 <2.2.0",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.10.tgz"
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.11.tgz"
    },
    "minimatch": {
      "version": "2.0.10",
@ -2228,9 +2313,9 @@
      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz"
    },
    "nan": {
-      "version": "2.2.1",
-      "from": "nan@>=2.0.8 <3.0.0",
-      "resolved": "https://registry.npmjs.org/nan/-/nan-2.2.1.tgz"
+      "version": "2.3.4",
+      "from": "nan@>=2.3.2 <3.0.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.3.4.tgz"
    },
    "natural-compare": {
      "version": "1.2.2",
@ -2249,7 +2334,7 @@
    },
    "node-gyp": {
      "version": "3.3.1",
-      "from": "node-gyp@>=3.0.1 <4.0.0",
+      "from": "node-gyp@>=3.3.1 <4.0.0",
      "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-3.3.1.tgz",
      "dependencies": {
        "glob": {
@ -2259,7 +2344,8 @@
          "dependencies": {
            "minimatch": {
              "version": "2.0.10",
-              "from": "minimatch@>=2.0.1 <3.0.0"
+              "from": "minimatch@^2.0.1",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"
            }
          }
        },
@ -2281,51 +2367,14 @@
      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz"
    },
    "node-sass": {
-      "version": "3.4.2",
-      "from": "node-sass@>=3.4.0 <4.0.0",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.4.2.tgz",
+      "version": "3.7.0",
+      "from": "node-sass@>=3.7.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-3.7.0.tgz",
      "dependencies": {
-        "cross-spawn": {
-          "version": "2.2.2",
-          "from": "cross-spawn@>=2.0.0 <3.0.0",
-          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-2.2.2.tgz"
-        },
-        "gaze": {
-          "version": "0.5.2",
-          "from": "gaze@>=0.5.1 <0.6.0",
-          "resolved": "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz"
-        },
-        "globule": {
-          "version": "0.1.0",
-          "from": "globule@>=0.1.0 <0.2.0",
-          "resolved": "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz",
-          "dependencies": {
-            "glob": {
-              "version": "3.1.21",
-              "from": "glob@>=3.1.21 <3.2.0",
-              "resolved": "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz"
-            }
-          }
-        },
-        "graceful-fs": {
-          "version": "1.2.3",
-          "from": "graceful-fs@>=1.2.0 <1.3.0",
-          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-1.2.3.tgz"
-        },
-        "inherits": {
-          "version": "1.0.2",
-          "from": "inherits@>=1.0.0 <2.0.0",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-1.0.2.tgz"
-        },
-        "lodash": {
-          "version": "1.0.2",
-          "from": "lodash@>=1.0.1 <1.1.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"
-        },
-        "minimatch": {
-          "version": "0.2.14",
-          "from": "minimatch@>=0.2.11 <0.3.0",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"
+        "glob": {
+          "version": "7.0.3",
+          "from": "glob@>=7.0.3 <8.0.0",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.3.tgz"
        }
      }
    },
@ -2373,7 +2422,7 @@
    },
    "normalize-path": {
      "version": "2.0.1",
-      "from": "normalize-path@>=2.0.0 <2.1.0",
+      "from": "normalize-path@>=2.0.0 <3.0.0",
      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.0.1.tgz"
    },
    "normalize-range": {
@ -2381,22 +2430,10 @@
      "from": "normalize-range@>=0.1.2 <0.2.0",
      "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"
    },
-    "npmconf": {
-      "version": "2.1.2",
-      "from": "npmconf@>=2.1.2 <3.0.0",
-      "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.2.tgz",
-      "dependencies": {
-        "nopt": {
-          "version": "3.0.6",
-          "from": "nopt@>=3.0.1 <3.1.0",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz"
-        }
-      }
-    },
    "npmlog": {
-      "version": "2.0.3",
+      "version": "2.0.4",
      "from": "npmlog@>=0.0.0 <1.0.0||>=1.0.0 <2.0.0||>=2.0.0 <3.0.0",
-      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.3.tgz"
+      "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-2.0.4.tgz"
    },
    "num2fraction": {
      "version": "1.2.2",
@ -2409,14 +2446,14 @@
      "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.0.tgz"
    },
    "oauth-sign": {
-      "version": "0.8.1",
+      "version": "0.8.2",
      "from": "oauth-sign@>=0.8.0 <0.9.0",
-      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz"
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"
    },
    "object-assign": {
-      "version": "4.0.1",
+      "version": "4.1.0",
      "from": "object-assign@>=4.0.1 <5.0.0",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.0.1.tgz"
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.0.tgz"
    },
    "on-finished": {
      "version": "2.3.0",
@ -2439,26 +2476,21 @@
      "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz"
    },
    "opn": {
-      "version": "4.0.1",
+      "version": "4.0.2",
      "from": "opn@>=4.0.0 <5.0.0",
-      "resolved": "https://registry.npmjs.org/opn/-/opn-4.0.1.tgz"
-    },
-    "optimist": {
-      "version": "0.6.1",
-      "from": "optimist@>=0.6.1 <0.7.0",
-      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.10",
-          "from": "minimist@>=0.0.1 <0.1.0",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"
-        }
-      }
+      "resolved": "https://registry.npmjs.org/opn/-/opn-4.0.2.tgz"
    },
    "optionator": {
-      "version": "0.6.0",
-      "from": "optionator@>=0.6.0 <0.7.0",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.6.0.tgz"
+      "version": "0.8.1",
+      "from": "optionator@>=0.8.1 <0.9.0",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.1.tgz",
+      "dependencies": {
+        "wordwrap": {
+          "version": "1.0.0",
+          "from": "wordwrap@>=1.0.0 <1.1.0",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"
+        }
+      }
    },
    "os-homedir": {
      "version": "1.0.1",
@ -2470,11 +2502,6 @@
      "from": "os-locale@>=1.4.0 <2.0.0",
      "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"
    },
-    "os-shim": {
-      "version": "0.1.3",
-      "from": "os-shim@>=0.1.2 <0.2.0",
-      "resolved": "https://registry.npmjs.org/os-shim/-/os-shim-0.1.3.tgz"
-    },
    "os-tmpdir": {
      "version": "1.0.1",
      "from": "os-tmpdir@>=1.0.1 <2.0.0",
@ -2556,9 +2583,9 @@
      "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.7.tgz",
      "dependencies": {
        "which": {
-          "version": "1.2.4",
+          "version": "1.2.9",
          "from": "which@>=1.2.2 <1.3.0",
-          "resolved": "https://registry.npmjs.org/which/-/which-1.2.4.tgz"
+          "resolved": "https://registry.npmjs.org/which/-/which-1.2.9.tgz"
        }
      }
    },
@ -2592,6 +2619,11 @@
      "from": "plur@>=1.0.0 <2.0.0",
      "resolved": "https://registry.npmjs.org/plur/-/plur-1.0.0.tgz"
    },
+    "pluralize": {
+      "version": "1.2.1",
+      "from": "pluralize@>=1.2.1 <2.0.0",
+      "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz"
+    },
    "portscanner": {
      "version": "1.0.0",
      "from": "portscanner@>=1.0.0 <2.0.0",
@ -2605,9 +2637,9 @@
      }
    },
    "postcss": {
-      "version": "5.0.19",
+      "version": "5.0.21",
      "from": "postcss@>=5.0.19 <6.0.0",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.0.19.tgz"
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.0.21.tgz"
    },
    "postcss-value-parser": {
      "version": "3.3.0",
@ -2635,9 +2667,9 @@
      "resolved": "https://registry.npmjs.org/private/-/private-0.1.6.tgz"
    },
    "process-nextick-args": {
-      "version": "1.0.6",
+      "version": "1.0.7",
      "from": "process-nextick-args@>=1.0.6 <1.1.0",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz"
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"
    },
    "progress": {
      "version": "1.1.8",
@ -2649,11 +2681,6 @@
      "from": "prompt@>=0.2.14 <0.3.0",
      "resolved": "https://registry.npmjs.org/prompt/-/prompt-0.2.14.tgz"
    },
-    "proto-list": {
-      "version": "1.2.4",
-      "from": "proto-list@>=1.2.1 <1.3.0",
-      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"
-    },
    "pseudomap": {
      "version": "1.0.2",
      "from": "pseudomap@>=1.0.1 <2.0.0",
@ -2707,16 +2734,9 @@
      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"
    },
    "readable-stream": {
-      "version": "2.0.6",
-      "from": "readable-stream@>=2.0.0 <2.1.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
-      "dependencies": {
-        "isarray": {
-          "version": "1.0.0",
-          "from": "isarray@>=1.0.0 <1.1.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-        }
-      }
+      "version": "2.1.4",
+      "from": "readable-stream@>=2.0.0 <3.0.0",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.4.tgz"
    },
    "readline2": {
      "version": "1.0.1",
@ -2734,15 +2754,20 @@
      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"
    },
    "regenerate": {
-      "version": "1.2.1",
+      "version": "1.3.0",
      "from": "regenerate@>=1.2.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.2.1.tgz"
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.3.0.tgz"
    },
    "regenerator": {
      "version": "0.8.40",
      "from": "regenerator@0.8.40",
      "resolved": "https://registry.npmjs.org/regenerator/-/regenerator-0.8.40.tgz"
    },
+    "regenerator-runtime": {
+      "version": "0.9.5",
+      "from": "regenerator-runtime@>=0.9.5 <0.10.0",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.5.tgz"
+    },
    "regexpu": {
      "version": "1.3.0",
      "from": "regexpu@>=1.3.0 <2.0.0",
@ -2784,6 +2809,11 @@
          "version": "1.0.3",
          "from": "bl@>=1.0.0 <1.1.0",
          "resolved": "https://registry.npmjs.org/bl/-/bl-1.0.3.tgz"
+        },
+        "readable-stream": {
+          "version": "2.0.6",
+          "from": "readable-stream@>=2.0.5 <2.1.0",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"
        }
      }
    },
@ -2879,6 +2909,11 @@
          "from": "http-signature@>=0.10.0 <0.11.0",
          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz"
        },
+        "isarray": {
+          "version": "0.0.1",
+          "from": "isarray@0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
+        },
        "mime-db": {
          "version": "1.12.0",
          "from": "mime-db@>=1.12.0 <1.13.0",
@ -2900,9 +2935,9 @@
          "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
        },
        "readable-stream": {
-          "version": "1.0.33",
+          "version": "1.0.34",
          "from": "readable-stream@>=1.0.26 <1.1.0",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
        },
        "request": {
          "version": "2.51.0",
@ -2916,6 +2951,18 @@
        }
      }
    },
+    "require-uncached": {
+      "version": "1.0.2",
+      "from": "require-uncached@>=1.0.2 <2.0.0",
+      "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.2.tgz",
+      "dependencies": {
+        "resolve-from": {
+          "version": "1.0.1",
+          "from": "resolve-from@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz"
+        }
+      }
+    },
    "reserved-words": {
      "version": "0.1.1",
      "from": "reserved-words@>=0.1.1 <0.2.0",
@ -2968,7 +3015,7 @@
    },
    "sass-graph": {
      "version": "2.1.1",
-      "from": "sass-graph@>=2.0.1 <3.0.0",
+      "from": "sass-graph@>=2.1.1 <3.0.0",
      "resolved": "https://registry.npmjs.org/sass-graph/-/sass-graph-2.1.1.tgz",
      "dependencies": {
        "glob": {
@ -2977,9 +3024,9 @@
          "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"
        },
        "lodash": {
-          "version": "4.10.0",
+          "version": "4.13.1",
          "from": "lodash@>=4.0.0 <5.0.0",
-          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.10.0.tgz"
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"
        }
      }
    },
@ -3140,9 +3187,16 @@
      "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz"
    },
    "send": {
-      "version": "0.13.1",
-      "from": "send@0.13.1",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.13.1.tgz"
+      "version": "0.13.2",
+      "from": "send@0.13.2",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.13.2.tgz",
+      "dependencies": {
+        "statuses": {
+          "version": "1.2.1",
+          "from": "statuses@>=1.2.1 <1.3.0",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"
+        }
+      }
    },
    "serve-index": {
      "version": "1.7.3",
@ -3150,9 +3204,9 @@
      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz"
    },
    "serve-static": {
-      "version": "1.10.2",
+      "version": "1.10.3",
      "from": "serve-static@>=1.10.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.2.tgz"
+      "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz"
    },
    "set-immediate-shim": {
      "version": "1.0.1",
@ -3194,15 +3248,20 @@
      "from": "slash@>=1.0.0 <2.0.0",
      "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"
    },
+    "slice-ansi": {
+      "version": "0.0.4",
+      "from": "slice-ansi@0.0.4",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-0.0.4.tgz"
+    },
    "sntp": {
      "version": "1.0.9",
      "from": "sntp@>=1.0.0 <2.0.0",
      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"
    },
    "source-map": {
-      "version": "0.5.3",
-      "from": "source-map@>=0.5.1 <0.6.0",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.3.tgz"
+      "version": "0.5.6",
+      "from": "source-map@>=0.5.5 <0.6.0",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"
    },
    "source-map-support": {
      "version": "0.2.10",
@ -3216,11 +3275,6 @@
        }
      }
    },
-    "spawn-sync": {
-      "version": "1.0.15",
-      "from": "spawn-sync@>=1.0.15 <2.0.0",
-      "resolved": "https://registry.npmjs.org/spawn-sync/-/spawn-sync-1.0.15.tgz"
-    },
    "spdx-correct": {
      "version": "1.0.2",
      "from": "spdx-correct@>=1.0.0 <1.1.0",
@ -3252,9 +3306,16 @@
      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
    },
    "sshpk": {
-      "version": "1.7.4",
+      "version": "1.8.3",
      "from": "sshpk@>=1.7.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.7.4.tgz"
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.8.3.tgz",
+      "dependencies": {
+        "assert-plus": {
+          "version": "1.0.0",
+          "from": "assert-plus@>=1.0.0 <2.0.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+        }
+      }
    },
    "stable": {
      "version": "0.1.5",
@ -3267,9 +3328,9 @@
      "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz"
    },
    "statuses": {
-      "version": "1.2.1",
+      "version": "1.3.0",
      "from": "statuses@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.0.tgz"
    },
    "stream-buffers": {
      "version": "2.2.0",
@ -3326,15 +3387,32 @@
      "from": "supports-color@>=3.1.2 <4.0.0",
      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz"
    },
+    "table": {
+      "version": "3.7.8",
+      "from": "table@>=3.7.8 <4.0.0",
+      "resolved": "https://registry.npmjs.org/table/-/table-3.7.8.tgz",
+      "dependencies": {
+        "bluebird": {
+          "version": "3.4.0",
+          "from": "bluebird@>=3.1.1 <4.0.0",
+          "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.4.0.tgz"
+        },
+        "lodash": {
+          "version": "4.13.1",
+          "from": "lodash@^4.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"
+        }
+      }
+    },
    "tar": {
      "version": "2.2.1",
      "from": "tar@>=2.0.0 <3.0.0",
      "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz"
    },
    "tar-stream": {
-      "version": "1.3.2",
-      "from": "tar-stream@>=1.3.1 <1.4.0",
-      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.3.2.tgz"
+      "version": "1.5.2",
+      "from": "tar-stream@>=1.5.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.2.tgz"
    },
    "temporary": {
      "version": "0.0.8",
@ -3342,9 +3420,9 @@
      "resolved": "https://registry.npmjs.org/temporary/-/temporary-0.0.8.tgz"
    },
    "tether": {
-      "version": "1.2.0",
+      "version": "1.3.2",
      "from": "tether@>=1.1.1 <2.0.0",
-      "resolved": "https://registry.npmjs.org/tether/-/tether-1.2.0.tgz"
+      "resolved": "https://registry.npmjs.org/tether/-/tether-1.3.2.tgz"
    },
    "text-table": {
      "version": "0.2.0",
@ -3429,14 +3507,19 @@
      "resolved": "https://registry.npmjs.org/tryor/-/tryor-0.1.2.tgz"
    },
    "tunnel-agent": {
-      "version": "0.4.2",
+      "version": "0.4.3",
      "from": "tunnel-agent@>=0.4.1 <0.5.0",
-      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz"
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz"
+    },
+    "tv4": {
+      "version": "1.2.7",
+      "from": "tv4@>=1.2.7 <2.0.0",
+      "resolved": "https://registry.npmjs.org/tv4/-/tv4-1.2.7.tgz"
    },
    "tweetnacl": {
-      "version": "0.14.3",
-      "from": "tweetnacl@>=0.13.0 <1.0.0",
-      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.3.tgz"
+      "version": "0.13.3",
+      "from": "tweetnacl@>=0.13.0 <0.14.0",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz"
    },
    "type-check": {
      "version": "0.3.2",
@ -3444,9 +3527,9 @@
      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"
    },
    "type-is": {
-      "version": "1.6.12",
+      "version": "1.6.13",
      "from": "type-is@>=1.6.10 <1.7.0",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.12.tgz"
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.13.tgz"
    },
    "typedarray": {
      "version": "0.0.6",
@ -3480,11 +3563,6 @@
      "from": "uglify-to-browserify@>=1.0.0 <1.1.0",
      "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"
    },
-    "uid-number": {
-      "version": "0.0.5",
-      "from": "uid-number@0.0.5",
-      "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz"
-    },
    "underscore": {
      "version": "1.7.0",
      "from": "underscore@>=1.7.0 <1.8.0",
@ -3532,6 +3610,11 @@
      "from": "utils-merge@1.0.0",
      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"
    },
+    "uuid": {
+      "version": "2.0.2",
+      "from": "uuid@>=2.0.2 <3.0.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.2.tgz"
+    },
    "validate-npm-package-license": {
      "version": "3.0.1",
      "from": "validate-npm-package-license@>=3.0.1 <4.0.0",
@ -3548,9 +3631,9 @@
      "resolved": "https://registry.npmjs.org/vow/-/vow-0.4.12.tgz"
    },
    "vow-fs": {
-      "version": "0.3.4",
+      "version": "0.3.5",
      "from": "vow-fs@>=0.3.4 <0.4.0",
-      "resolved": "https://registry.npmjs.org/vow-fs/-/vow-fs-0.3.4.tgz",
+      "resolved": "https://registry.npmjs.org/vow-fs/-/vow-fs-0.3.5.tgz",
      "dependencies": {
        "glob": {
          "version": "4.5.3",
@ -3565,9 +3648,9 @@
      "resolved": "https://registry.npmjs.org/vow-queue/-/vow-queue-0.4.2.tgz"
    },
    "websocket-driver": {
-      "version": "0.6.4",
+      "version": "0.6.5",
      "from": "websocket-driver@>=0.5.1",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.4.tgz"
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"
    },
    "websocket-extensions": {
      "version": "0.1.1",
@ -3607,25 +3690,25 @@
      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"
    },
    "wrappy": {
-      "version": "1.0.1",
+      "version": "1.0.2",
      "from": "wrappy@>=1.0.0 <2.0.0",
-      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.1.tgz"
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
    },
    "write": {
      "version": "0.2.1",
      "from": "write@>=0.2.1 <0.3.0",
      "resolved": "https://registry.npmjs.org/write/-/write-0.2.1.tgz"
    },
-    "xml-escape": {
-      "version": "1.0.0",
-      "from": "xml-escape@>=1.0.0 <1.1.0",
-      "resolved": "https://registry.npmjs.org/xml-escape/-/xml-escape-1.0.0.tgz"
-    },
    "xmlbuilder": {
      "version": "3.1.0",
      "from": "xmlbuilder@>=3.1.0 <4.0.0",
      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-3.1.0.tgz"
    },
+    "xregexp": {
+      "version": "3.1.1",
+      "from": "xregexp@>=3.0.0 <4.0.0",
+      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-3.1.1.tgz"
+    },
    "xtend": {
      "version": "4.0.1",
      "from": "xtend@>=4.0.0 <5.0.0",
@ -3652,9 +3735,16 @@
      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz"
    },
    "zip-stream": {
-      "version": "0.8.0",
-      "from": "zip-stream@>=0.8.0 <0.9.0",
-      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-0.8.0.tgz"
+      "version": "1.0.0",
+      "from": "zip-stream@>=1.0.0 <2.0.0",
+      "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-1.0.0.tgz",
+      "dependencies": {
+        "lodash": {
+          "version": "4.13.1",
+          "from": "lodash@>=4.8.0 <5.0.0",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.13.1.tgz"
+        }
+      }
    }
  }
 }
--- a/js/.eslintrc.json
+++ b/js/.eslintrc.json
@ -1,8 +1,13 @@
 {
    "root": true,
    "parser": "babel-eslint",
+    "parserOptions": {
+        "ecmaVersion": 6,
+        "sourceType": "module"
+    },
    "env": {
        "browser": true,
+        "es6": true,
        "jquery": true
    },
    "rules": {
@ -21,6 +26,7 @@
        "no-duplicate-case": 2,
        "no-empty": 2,
        "no-empty-character-class": 2,
+        "no-empty-pattern": 2,
        "no-ex-assign": 2,
        "no-extra-boolean-cast": 2,
        "no-extra-parens": 0,
@ -32,6 +38,7 @@
        "no-negated-in-lhs": 2,
        "no-obj-calls": 2,
        "no-regex-spaces": 2,
+        "no-self-assign": 2,
        "no-sparse-arrays": 2,
        "no-unexpected-multiline": 2,
        "no-unreachable": 2,
@ -51,9 +58,9 @@
        "guard-for-in": 2,
        "no-alert": 2,
        "no-caller": 2,
+        "no-case-declarations": 2,
        "no-div-regex": 2,
        "no-else-return": 2,
-        "no-empty-label": 2,
        "no-eq-null": 2,
        "no-eval": 2,
        "no-extend-native": 2,
@ -67,6 +74,7 @@
        "no-labels": 2,
        "no-lone-blocks": 2,
        "no-loop-func": 2,
+        "no-magic-numbers": [2, {"ignore": [-1, 0, 1]}],
        "no-multi-spaces": 0,
        "no-multi-str": 2,
        "no-native-reassign": 2,
@ -122,6 +130,7 @@
        "func-style": 0,
        "indent": [2, 2, {"SwitchCase": 1}],
        "key-spacing": 0,
+        "keyword-spacing": 2,
        "linebreak-style": 2,
        "lines-around-comment": 0,
        "new-cap": 0,
@ -150,13 +159,11 @@
        "semi": [2, "never"],
        "semi-spacing": 2,
        "sort-vars": 2,
-        "space-after-keywords": 2,
        "space-before-blocks": 2,
        "space-before-function-paren": 0,
        "spaced-comment": 2,
        "space-infix-ops": 2,
        "space-in-parens": 2,
-        "space-return-throw-case": 2,
        "space-unary-ops": 2,

        // es6
@ -167,6 +174,7 @@
        "no-class-assign": 2,
        "no-const-assign": 2,
        "no-dupe-class-members": 2,
+        "no-new-symbol": 2,
        "no-this-before-super": 2,
        "no-var": 2,
        "object-shorthand": 2,
--- a/js/src/carousel.js
+++ b/js/src/carousel.js
@ -24,6 +24,8 @@ const Carousel = (($) => {
  const DATA_API_KEY        = '.data-api'
  const JQUERY_NO_CONFLICT  = $.fn[NAME]
  const TRANSITION_DURATION = 600
+  const ARROW_LEFT_KEYCODE  = 37 // KeyboardEvent.which value for left arrow key
+  const ARROW_RIGHT_KEYCODE = 39 // KeyboardEvent.which value for right arrow key

  const Default = {
    interval : 5000,
@ -236,8 +238,8 @@ const Carousel = (($) => {
      }

      switch (event.which) {
-        case 37: this.prev(); break
-        case 39: this.next(); break
+        case ARROW_LEFT_KEYCODE: this.prev(); break
+        case ARROW_RIGHT_KEYCODE: this.next(); break
        default: return
      }
    }
--- a/js/src/dropdown.js
+++ b/js/src/dropdown.js
@ -17,12 +17,16 @@ const Dropdown = (($) => {
   * ------------------------------------------------------------------------
   */

-  const NAME                = 'dropdown'
-  const VERSION             = '4.0.0-alpha.2'
-  const DATA_KEY            = 'bs.dropdown'
-  const EVENT_KEY           = `.${DATA_KEY}`
-  const DATA_API_KEY        = '.data-api'
-  const JQUERY_NO_CONFLICT  = $.fn[NAME]
+  const NAME                     = 'dropdown'
+  const VERSION                  = '4.0.0-alpha.2'
+  const DATA_KEY                 = 'bs.dropdown'
+  const EVENT_KEY                = `.${DATA_KEY}`
+  const DATA_API_KEY             = '.data-api'
+  const JQUERY_NO_CONFLICT       = $.fn[NAME]
+  const ESCAPE_KEYCODE           = 27 // KeyboardEvent.which value for Escape (Esc) key
+  const ARROW_UP_KEYCODE         = 38 // KeyboardEvent.which value for up arrow key
+  const ARROW_DOWN_KEYCODE       = 40 // KeyboardEvent.which value for down arrow key
+  const RIGHT_MOUSE_BUTTON_WHICH = 3 // MouseEvent.which value for the right button (assuming a right-handed mouse)

  const Event = {
    HIDE             : `hide${EVENT_KEY}`,
@ -152,7 +156,7 @@ const Dropdown = (($) => {
    }

    static _clearMenus(event) {
-      if (event && event.which === 3) {
+      if (event && event.which === RIGHT_MOUSE_BUTTON_WHICH) {
        return
      }

@ -218,10 +222,10 @@ const Dropdown = (($) => {
      let parent   = Dropdown._getParentFromElement(this)
      let isActive = $(parent).hasClass(ClassName.OPEN)

-      if ((!isActive && event.which !== 27) ||
-           (isActive && event.which === 27)) {
+      if ((!isActive && event.which !== ESCAPE_KEYCODE) ||
+           (isActive && event.which === ESCAPE_KEYCODE)) {

-        if (event.which === 27) {
+        if (event.which === ESCAPE_KEYCODE) {
          let toggle = $(parent).find(Selector.DATA_TOGGLE)[0]
          $(toggle).trigger('focus')
        }
@ -242,11 +246,11 @@ const Dropdown = (($) => {

      let index = items.indexOf(event.target)

-      if (event.which === 38 && index > 0) { // up
+      if (event.which === ARROW_UP_KEYCODE && index > 0) { // up
        index--
      }

-      if (event.which === 40 && index < items.length - 1) { // down
+      if (event.which === ARROW_DOWN_KEYCODE && index < items.length - 1) { // down
        index++
      }

--- a/js/src/modal.js
+++ b/js/src/modal.js
@ -25,6 +25,7 @@ const Modal = (($) => {
  const JQUERY_NO_CONFLICT           = $.fn[NAME]
  const TRANSITION_DURATION          = 300
  const BACKDROP_TRANSITION_DURATION = 150
+  const ESCAPE_KEYCODE               = 27 // KeyboardEvent.which value for Escape (Esc) key

  const Default = {
    backdrop : true,
@ -271,7 +272,7 @@ const Modal = (($) => {
    _setEscapeEvent() {
      if (this._isShown && this._config.keyboard) {
        $(this._element).on(Event.KEYDOWN_DISMISS, (event) => {
-          if (event.which === 27) {
+          if (event.which === ESCAPE_KEYCODE) {
            this.hide()
          }
        })
@ -400,7 +401,7 @@ const Modal = (($) => {
      }

      if (this._isBodyOverflowing && !isModalOverflowing) {
-        this._element.style.paddingRight = `${this._scrollbarWidth}px~`
+        this._element.style.paddingRight = `${this._scrollbarWidth}px`
      }
    }

--- a/js/src/scrollspy.js
+++ b/js/src/scrollspy.js
@ -140,6 +140,7 @@ const ScrollSpy = (($) => {
              targetSelector
            ]
          }
+          return null
        })
        .filter((item)  => item)
        .sort((a, b)    => a[0] - b[0])
--- a/js/src/util.js
+++ b/js/src/util.js
@ -16,6 +16,8 @@ const Util = (($) => {

  let transition = false

+  const MAX_UID = 1000000
+
  const TransitionEndEvent = {
    WebkitTransition : 'webkitTransitionEnd',
    MozTransition    : 'transitionend',
@ -40,6 +42,7 @@ const Util = (($) => {
        if ($(event.target).is(this)) {
          return event.handleObj.handler.apply(this, arguments)
        }
+        return undefined
      }
    }
  }
@ -100,7 +103,7 @@ const Util = (($) => {
    getUID(prefix) {
      do {
        /* eslint-disable no-bitwise */
-        prefix += ~~(Math.random() * 1000000) // "~~" acts like a faster Math.floor() here
+        prefix += ~~(Math.random() * MAX_UID) // "~~" acts like a faster Math.floor() here
        /* eslint-enable no-bitwise */
      } while (document.getElementById(prefix))
      return prefix
--- a/js/tests/unit/scrollspy.js
+++ b/js/tests/unit/scrollspy.js
@ -81,7 +81,7 @@ $(function () {
      .find('#scrollspy-example')
      .bootstrapScrollspy({ target: '#ss-target' })

-    $scrollspy.on('scroll.bs.scrollspy', function () {
+    $scrollspy.one('scroll', function () {
      assert.ok($section.hasClass('active'), '"active" class still on root node')
      done()
    })
@ -126,7 +126,7 @@ $(function () {
      .find('#scrollspy-example')
      .bootstrapScrollspy({ target: document.getElementById('#ss-target') })

-    $scrollspy.on('scroll.bs.scrollspy', function () {
+    $scrollspy.one('scroll', function () {
      assert.ok($section.hasClass('active'), '"active" class still on root node')
      done()
    })
@ -158,7 +158,7 @@ $(function () {

    $scrollspy.bootstrapScrollspy({ target: '#navigation', offset: $scrollspy.position().top })

-    $scrollspy.on('scroll.bs.scrollspy', function () {
+    $scrollspy.one('scroll', function () {
      assert.ok(!$section.find('#one-link').hasClass('active'), '"active" class removed from first section')
      assert.ok($section.find('#two-link').hasClass('active'), '"active" class on middle section')
      assert.ok(!$section.find('#three-link').hasClass('active'), '"active" class not on last section')
@ -272,11 +272,11 @@ $(function () {
        target: '#navigation',
        offset: $scrollspy.position().top
      })
-      .one('scroll.bs.scrollspy', function () {
+      .one('scroll', function () {
        assert.strictEqual($('.active').length, 1, '"active" class on only one element present')
        assert.strictEqual($('.active').is('#two-link'), true, '"active" class on second section')
        $scrollspy
-          .one('scroll.bs.scrollspy', function () {
+          .one('scroll', function () {
            assert.strictEqual($('.active').length, 0, 'selection cleared')
            done()
          })
@ -357,12 +357,12 @@ $(function () {
        .appendTo('#qunit-fixture')

      if (type === 'js') $content.bootstrapScrollspy({ target: '.navbar', offset: 0, method: 'offset' })
-      else if (type === 'data') $(window).trigger('load.bs.scrollspy.data-api')
+      else if (type === 'data') $(window).trigger('load')

      var $target = $('#div-' + type + 'm-2')
      var scrollspy = $content.data('bs.scrollspy')

-      assert.ok(scrollspy._offsets[1] === $target.offset().top, 'offsed method with ' + type + ' option')
+      assert.ok(scrollspy._offsets[1] === $target.offset().top, 'offset method with ' + type + ' option')
      assert.ok(scrollspy._offsets[1] !== $target.position().top, 'position method with ' + type + ' option')

      deferred.resolve()
@ -400,12 +400,12 @@ $(function () {
        .appendTo('#qunit-fixture')

      if (type === 'js') $content.bootstrapScrollspy({ target: '.navbar', offset: 0, method: 'position' })
-      else if (type === 'data') $(window).trigger('load.bs.scrollspy.data-api')
+      else if (type === 'data') $(window).trigger('load')

      var $target = $('#div-' + type + 'm-2')
      var scrollspy = $content.data('bs.scrollspy')

-      assert.ok(scrollspy._offsets[1] !== $target.offset().top, 'offsed method with ' + type + ' option')
+      assert.ok(scrollspy._offsets[1] !== $target.offset().top, 'offset method with ' + type + ' option')
      assert.ok(scrollspy._offsets[1] === $target.position().top, 'position method with ' + type + ' option')

      deferred.resolve()
--- a/js/tests/vendor/jquery.min.js
+++ b/js/tests/vendor/jquery.min.js
--- a/nuget/bootstrap.nuspec
+++ b/nuget/bootstrap.nuspec
@ -4,7 +4,7 @@
    <id>bootstrap</id>
    <version>4.0.0-alpha</version>
    <title>Bootstrap CSS</title>
-    <authors>Twitter, Inc.</authors>
+    <authors>The Bootstrap Authors, Twitter Inc.</authors>
    <owners>bootstrap</owners>
 	<description>The most popular front-end framework for developing responsive, mobile first projects on the web.</description>
 	<releaseNotes>http://blog.getbootstrap.com</releaseNotes>
--- a/nuget/bootstrap.sass.nuspec
+++ b/nuget/bootstrap.sass.nuspec
@ -4,7 +4,7 @@
    <id>bootstrap.sass</id>
    <version>4.0.0-alpha</version>
    <title>Bootstrap Sass</title>
-    <authors>Twitter, Inc.</authors>
+    <authors>The Bootstrap Authors, Twitter Inc.</authors>
    <owners>bootstrap</owners>
 	<description>The most popular front-end framework for developing responsive, mobile first projects on the web.</description>
    <releaseNotes>http://blog.getbootstrap.com</releaseNotes>
--- a/package.json
+++ b/package.json
@ -12,11 +12,13 @@
    "web"
  ],
  "homepage": "http://getbootstrap.com",
-  "author": "Twitter, Inc.",
+  "author": "The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)",
+  "contributors": ["Twitter, Inc."],
  "scripts": {
    "change-version": "node grunt/change-version.js",
    "shrinkwrap": "npm shrinkwrap --dev && mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json",
-    "test": "grunt test"
+    "eslint": "eslint --config js/.eslintrc.json js/src",
+    "test": "npm run eslint && grunt test"
  },
  "style": "dist/css/bootstrap.css",
  "sass": "scss/bootstrap.scss",
@ -35,7 +37,8 @@
  },
  "devDependencies": {
    "autoprefixer": "^6.0.3",
-    "babel-eslint": "^4.1.3",
+    "babel-eslint": "^6.0.4",
+    "eslint": "^2.2.0",
    "grunt": "^0.4.5",
    "grunt-babel": "^5.0.3",
    "grunt-build-control": "^0.6.0",
@ -49,7 +52,6 @@
    "grunt-contrib-sass": "^1.0.0",
    "grunt-contrib-uglify": "^1.0.0",
    "grunt-contrib-watch": "^1.0.0",
-    "grunt-eslint": "^17.1.0",
    "grunt-exec": "^0.4.6",
    "grunt-html": "^7.0.0",
    "grunt-jekyll": "^0.4.2",
--- a/scss/bootstrap.scss
+++ b/scss/bootstrap.scss
@ -1,5 +1,6 @@
 /*!
 * Bootstrap v4.0.0-alpha.2 (http://getbootstrap.com)
+ * Copyright 2011-2016 The Bootstrap Authors
 * Copyright 2011-2016 Twitter, Inc.
 * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
 */