Merge branch 'need-to-activate-animated-progressbar' of...

Merge branch 'need-to-activate-animated-progressbar' of github.com:twbs/bootstrap into need-to-activate-animated-progressbar

Conflicts:
	docs/_includes/components/progress-bars.html
	docs/assets/js/src/application.js

docs/_includes/components/progress-bars.html

@@ -170,7 +170,7 @@
     <div class="progress">
       <div class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="45" aria-valuemin="0" aria-valuemax="100" style="width: 45%"><span class="sr-only">45% Complete</span></div>
     </div>
-    <button type="button" class="btn btn-default bs-docs-activate-aniamted-progressbar" data-toggle="button" aria-pressed="false" autocomplete="off">Toggle animation</button>
+    <button type="button" class="btn btn-default bs-docs-activate-animated-progressbar" data-toggle="button" aria-pressed="false" autocomplete="off">Toggle animation</button>
   </div>
 {% highlight html %}
 <div class="progress">

docs/assets/js/src/application.js

@@ -110,7 +110,7 @@
     })
 
     // Activate animated progress bar
-    $('.bs-docs-activate-aniamted-progressbar').on('click', function () {
+    $('.bs-docs-activate-animated-progressbar').on('click', function () {
       $(this).siblings('.progress').find('.progress-bar-striped').toggleClass('active')
     })