Merge branch 'master' into derp

Conflicts:
	Gruntfile.js
	_config.yml
	dist/css/bootstrap-theme.css
	dist/css/bootstrap-theme.css.map
	dist/css/bootstrap-theme.min.css
	dist/css/bootstrap.css
	dist/css/bootstrap.css.map
	dist/css/bootstrap.min.css
	docs/_includes/components/button-groups.html
	docs/_includes/components/jumbotron.html
	docs/_includes/components/media.html
	docs/_includes/components/navs.html
	docs/_includes/customizer-variables.html
	docs/_includes/footer.html
	docs/_includes/getting-started/browser-device-support.html
	docs/_includes/js/carousel.html
	docs/_includes/js/dropdowns.html
	docs/_includes/js/modal.html
	docs/_includes/js/popovers.html
	docs/_includes/js/tooltips.html
	docs/_includes/nav/getting-started.html
	docs/_includes/nav/javascript.html
	docs/_layouts/default.html
	docs/assets/css/docs.min.css
	docs/assets/css/src/docs.css
	docs/assets/js/customize.min.js
	docs/assets/js/docs.min.js
	docs/assets/js/raw-files.min.js
	docs/browser-bugs.html
	docs/dist/css/bootstrap-theme.css
	docs/dist/css/bootstrap-theme.css.map
	docs/dist/css/bootstrap-theme.min.css
	docs/dist/css/bootstrap.css
	docs/dist/css/bootstrap.css.map
	docs/dist/css/bootstrap.min.css
	docs/examples/justified-nav/index.html
	less/_forms.less
	less/_tooltip.less
	less/navs.less
	less/theme.less

2 files changed, 34 insertions, 0 deletions

diff --git a/docs/_plugins/bridge.rb b/docs/_plugins/bridge.rb
new file mode 100644
index 000000000..450a6cce3
--- /dev/null
+++ b/docs/_plugins/bridge.rb
@@ -0,0 +1,9 @@
+require 'yaml'
+
+module Bridge
+  class Generator < Jekyll::Generator
+    def generate(site)
+      site.data["configBridge"] = YAML.load_file("./grunt/configBridge.json")
+    end
+  end
+end
\ No newline at end of file
diff --git a/docs/_plugins/bugify.rb b/docs/_plugins/bugify.rb
new file mode 100644
index 000000000..3cee9e43f
--- /dev/null
+++ b/docs/_plugins/bugify.rb
@@ -0,0 +1,25 @@
+module Jekyll
+  module BugFilter
+    def bugify(input)
+      upstream_map = {
+        "Bootstrap" => "https://github.com/twbs/bootstrap/issues/",
+        "IE" => ["https://connect.microsoft.com/IE/feedback/details/", "IE bug"],
+        "Mozilla" => ["https://bugzilla.mozilla.org/show_bug.cgi?id=", "Mozilla bug"],
+        "Chromium" => ["https://code.google.com/p/chromium/issues/detail?id=", "Chromium issue"],
+        "WebKit" => ["https://bugs.webkit.org/show_bug.cgi?id=", "WebKit bug"],
+        "Safari" => ["https://openradar.appspot.com/", "Apple Safari Radar"],
+        "Normalize" => ["https://github.com/necolas/normalize.css/issues/", "Normalize"]
+      }
+
+      upstream_map.each do |key, data|
+        url = data.is_a?(Array) ? data[0] : data
+        label = data.is_a?(Array) ? "#{data[1]} " : ""
+        input = input.gsub(/#{key}#(\d+)/, "<a href=\"#{url}\\1\">#{label}#\\1</a>")
+      end
+
+      return input
+    end
+  end
+end
+
+Liquid::Template.register_filter(Jekyll::BugFilter)
\ No newline at end of file