From 6b727bcdd7cd2f9bdbdce31aa3dab003510c9084 Mon Sep 17 00:00:00 2001
From: Kazuaki Takemoto <libkazz@gmail.com>
Date: Wed, 1 Oct 2014 19:32:01 +0900
Subject: [PATCH 01/87] Use String#encode instead of Iconv

Modify to use String#encode instead of Iconv when ASCII Encodings.
There are two reasons:

1. @iconv was defined only encoding_to is NON_ASCII_ENCODINGS
2. Iconv is replaced from ruby-2.0

But when NON_ASCII_ENCODINGS, String#encoding cannot convert then
use Iconv as in the past.
---
 lib/rails_admin/support/csv_converter.rb      | 12 +++++-
 .../rails_admin/support/csv_converter_spec.rb | 39 +++++++++++++++++++
 2 files changed, 49 insertions(+), 2 deletions(-)

diff --git a/lib/rails_admin/support/csv_converter.rb b/lib/rails_admin/support/csv_converter.rb
index 306d34016d..416e4cad13 100644
--- a/lib/rails_admin/support/csv_converter.rb
+++ b/lib/rails_admin/support/csv_converter.rb
@@ -113,10 +113,18 @@ def generate_csv_row(object)
 
     def output(str)
       # Can't use the CSV generator with encodings that are not supersets of ASCII-7
-      return str.to_s if @encoding_to =~ NON_ASCII_ENCODINGS || !@iconv
+      return str.to_s if @encoding_to =~ NON_ASCII_ENCODINGS
 
       # Convert piece by piece
-      @iconv.iconv(str.to_s) rescue str.to_s
+      if @iconv
+        @iconv.iconv(str.to_s) rescue str.to_s
+      else
+        if @encoding_from != @encoding_to
+          str.to_s.encode(@encoding_to, @encoding_from, invalid: :replace, undef: :replace, replace: '?')
+        else
+          str.to_s
+        end
+      end
     end
   end
 end
diff --git a/spec/rails_admin/support/csv_converter_spec.rb b/spec/rails_admin/support/csv_converter_spec.rb
index b6a990e599..9cf2083e05 100644
--- a/spec/rails_admin/support/csv_converter_spec.rb
+++ b/spec/rails_admin/support/csv_converter_spec.rb
@@ -14,4 +14,43 @@
     schema = {only: [:number, :name]}
     expect(RailsAdmin::CSVConverter.new(objects, schema).to_csv({})[2]).to match(/Number,Name/)
   end
+
+
+  describe '#to_csv' do
+    before do
+      RailsAdmin.config(Player) do
+        export do
+          field :number
+          field :name
+        end
+      end
+
+      FactoryGirl.create :player, name: 'なまえ'
+    end
+
+    let(:objects) { Player.all }
+    let(:schema) { {only: [:number, :name]} }
+
+    subject { RailsAdmin::CSVConverter.new(objects, schema).to_csv({encoding_to: encoding}) }
+
+    context 'encoding to UTF-8' do
+      let(:encoding) { 'UTF-8' }
+
+      it 'should export to UTR-8 with BOM' do
+        expect(subject[1]).to eq 'UTF-8'
+        expect(subject[2].encoding).to eq Encoding::UTF_8
+        expect(subject[2]).to match(/\A\xEF\xBB\xBF/)  # have BOM
+      end
+    end
+
+    context 'encoding to Shift_JIS' do
+      let(:encoding) { 'Shift_JIS' }
+
+      it 'should export to Shift_JIS' do
+        expect(subject[1]).to eq 'Shift_JIS'
+        expect(subject[2].encoding).to eq Encoding::Shift_JIS
+      end
+    end
+
+  end
 end

From 7987ca7d038cb073fdc82699494a65cc2a717d30 Mon Sep 17 00:00:00 2001
From: Siarhei Hanchuk <siarheihanchuk@gmail.com>
Date: Tue, 21 Oct 2014 18:47:49 +0300
Subject: [PATCH 02/87] Fixed number translation in filter

---
 app/assets/javascripts/rails_admin/ra.filter-box.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/rails_admin/ra.filter-box.js b/app/assets/javascripts/rails_admin/ra.filter-box.js
index a0ae82c1ec..8f1fcdf703 100644
--- a/app/assets/javascripts/rails_admin/ra.filter-box.js
+++ b/app/assets/javascripts/rails_admin/ra.filter-box.js
@@ -76,7 +76,7 @@
         case 'decimal':
         case 'float':
           var control = '<select class="switch-additionnal-fieldsets input-small" name="' + operator_name + '">' +
-            '<option ' + (field_operator == "default"   ? 'selected="selected"' : '') + ' data-additional-fieldset="default" value="default">' + RailsAdmin.I18n.t("Number ...") + '</option>' +
+            '<option ' + (field_operator == "default"   ? 'selected="selected"' : '') + ' data-additional-fieldset="default" value="default">' + RailsAdmin.I18n.t("number") + '</option>' +
             '<option ' + (field_operator == "between"   ? 'selected="selected"' : '') + ' data-additional-fieldset="between" value="between">' + RailsAdmin.I18n.t("between_and_") + '</option>' +
             '<option disabled="disabled">---------</option>' +
             '<option ' + (field_operator == "_not_null" ? 'selected="selected"' : '') + ' value="_not_null">' + RailsAdmin.I18n.t("is_present") +'</option>' +

From 09fe1b2597dd8810c165731d8bb395b6c86ecc50 Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Wed, 22 Oct 2014 12:47:06 +0900
Subject: [PATCH 03/87] Use String#encode instead of iconv

---
 app/views/rails_admin/main/export.html.haml   |  2 +-
 lib/rails_admin/support/csv_converter.rb      | 58 +++++--------------
 .../rails_admin/support/csv_converter_spec.rb | 32 ++++++----
 3 files changed, 38 insertions(+), 54 deletions(-)

diff --git a/app/views/rails_admin/main/export.html.haml b/app/views/rails_admin/main/export.html.haml
index 1fd998eae4..03495d837d 100644
--- a/app/views/rails_admin/main/export.html.haml
+++ b/app/views/rails_admin/main/export.html.haml
@@ -51,7 +51,7 @@
       %label.control-label{for: "csv_options_encoding_to"}= t('admin.export.csv.encoding_to')
       .controls
         -# from http://books.google.com/support/partner/bin/answer.py?answer=30990 :
-        = select_tag 'csv_options[encoding_to]', options_for_select(["", "UTF-8", "UTF-16LE", "UTF-16BE", "UTF-32LE", "UTF-32BE", "UTF-7", "ISO-8859-1", "ISO-8859-15", "IBM-850", "MacRoman", "Windows-1252", "ISO-8859-3", "IBM-852", "ISO-8859-2", "MacCE", "Windows-1250", "IBM-855", "ISO-8859-5", "ISO-IR-111", "KOI8-R", "MacCyrillic", "Windows-1251", "CP-866", "KOI-U", "MacUkranian", "GB2312", "GBK", "GB18030", "HZ", "ISO-2022-CN", "Big5", "Big5-HKSCS", "EUC-TW", "EUC-JP", "ISO-2022-JP", "Shift_JIS", "EUC-KR", "UHC", "JOHAB", "ISO-2022-KR"])
+        = select_tag 'csv_options[encoding_to]', options_for_select(RailsAdmin::CSVConverter::TARGET_ENCODINGS), include_blank: true
         %p.help-block= t('admin.export.csv.encoding_to_help', name: guessed_encoding)
 
     .control-group
diff --git a/lib/rails_admin/support/csv_converter.rb b/lib/rails_admin/support/csv_converter.rb
index e4451d19db..08a6aff0e3 100644
--- a/lib/rails_admin/support/csv_converter.rb
+++ b/lib/rails_admin/support/csv_converter.rb
@@ -1,12 +1,10 @@
 # encoding: UTF-8
-require RUBY_VERSION < '1.9' ? 'fastercsv' : 'csv'
+require 'csv'
 
 module RailsAdmin
-  CSV_CLASS = RUBY_VERSION < '1.9' ? ::FasterCSV : ::CSV
-  NON_ASCII_ENCODINGS = /(UTF\-16)|(UTF\-32)|(EUC\-JP)|(ISO\-2022\-JP)|(Shift_JIS)|(Big5\-HKSCS)|(UTF\-7)/
-  UTF8_ENCODINGS = [nil, '', 'utf8', 'utf-8', 'unicode', 'UTF8', 'UTF-8', 'UNICODE']
-
   class CSVConverter
+    UTF8_ENCODINGS = [nil, '', 'utf8', 'utf-8', 'unicode', 'UTF8', 'UTF-8', 'UNICODE']
+    TARGET_ENCODINGS = %w(UTF-8 UTF-16LE UTF-16BE UTF-32LE UTF-32BE UTF-7 ISO-8859-1 ISO-8859-15 IBM850 MacRoman Windows-1252 ISO-8859-3 IBM852 ISO-8859-2 Windows-1250 IBM855 ISO-8859-5 KOI8-R MacCyrillic Windows-1251 IBM866 GB2312 GBK GB18030 Big5 Big5-HKSCS EUC-TW EUC-JP ISO-2022-JP Shift_JIS EUC-KR)
     def initialize(objects = [], schema = {})
       return self if (@objects = objects).blank?
 
@@ -37,33 +35,23 @@ def initialize(objects = [], schema = {})
 
     def to_csv(options = {})
       # encoding shenanigans first
-      @encoding_from = UTF8_ENCODINGS.include?(@abstract_model.encoding) ? 'UTF-8' : @abstract_model.encoding
-
-      @encoding_to = options[:encoding_to].presence || @encoding_from
+      @encoding_from = Encoding.find(UTF8_ENCODINGS.include?(@abstract_model.encoding) ? 'UTF-8' : @abstract_model.encoding)
+      @encoding_to = Encoding.find(options[:encoding_to].presence || @encoding_from)
 
       csv_string = generate_csv_string(options)
 
+      if @encoding_to != @encoding_from
+        csv_string = csv_string.encode(@encoding_to, @encoding_from, invalid: :replace, undef: :replace, replace: '?')
+      end
       # Add a BOM for utf8 encodings, helps with utf8 auto-detect for some versions of Excel.
       # Don't add if utf8 but user don't want to touch input encoding:
       # If user chooses utf8, they will open it in utf8 and BOM will disappear at reading.
       # But that way "English" users who don't bother and chooses to let utf8 by default won't get BOM added
       # and will not see it if Excel opens the file with a different encoding.
-      if options[:encoding_to] == 'UTF-8'
-        csv_string = csv_string.force_encoding('UTF-8') if csv_string.respond_to?(:force_encoding)
+      if options[:encoding_to].present? && @encoding_to == Encoding::UTF_8
         csv_string = "\xEF\xBB\xBF#{csv_string}"
       end
-      # global conversion for non ASCII encodings
-      if @encoding_to =~ NON_ASCII_ENCODINGS && @encoding_to != @encoding_from
-        require 'iconv'
-        begin
-          if @iconv = Iconv.new("#{@encoding_to}//TRANSLIT//IGNORE", @encoding_from)
-            csv_string = @iconv.iconv(csv_string) rescue csv_string
-          end
-        rescue
-          Rails.logger.error("Iconv cannot convert to #{@encoding_to}: #{$ERROR_INFO}\nNo conversion will take place")
-        end
-      end
-      [!options[:skip_header], @encoding_to, csv_string]
+      [!options[:skip_header], @encoding_to.to_s, csv_string]
     end
 
   private
@@ -78,7 +66,7 @@ def export_fields_for(method, model_config = @model_config)
 
     def generate_csv_string(options)
       generator_options = (options[:generator] || {}).symbolize_keys.delete_if { |_, value| value.blank? }
-      CSV_CLASS.generate(generator_options) do |csv|
+      CSV.generate(generator_options) do |csv|
         csv << generate_csv_header unless options[:skip_header]
 
         method = @objects.respond_to?(:find_each) ? :find_each : :each
@@ -90,39 +78,23 @@ def generate_csv_string(options)
 
     def generate_csv_header
       @fields.collect do |field|
-        output(::I18n.t('admin.export.csv.header_for_root_methods', name: field.label, model: @abstract_model.pretty_name))
+        ::I18n.t('admin.export.csv.header_for_root_methods', name: field.label, model: @abstract_model.pretty_name)
       end +
       @associations.flat_map do |_association_name, option_hash|
         option_hash[:fields].collect do |field|
-          output(::I18n.t('admin.export.csv.header_for_association_methods', name: field.label, association: option_hash[:association].label))
+          ::I18n.t('admin.export.csv.header_for_association_methods', name: field.label, association: option_hash[:association].label)
         end
       end
     end
 
     def generate_csv_row(object)
       @fields.collect do |field|
-        output(field.with(object: object).export_value)
+        field.with(object: object).export_value
       end +
       @associations.flat_map do |association_name, option_hash|
         associated_objects = [object.send(association_name)].flatten.compact
         option_hash[:fields].collect do |field|
-          output(associated_objects.collect { |ao| field.with(object: ao).export_value.presence || @empty }.join(','))
-        end
-      end
-    end
-
-    def output(str)
-      # Can't use the CSV generator with encodings that are not supersets of ASCII-7
-      return str.to_s if @encoding_to =~ NON_ASCII_ENCODINGS
-
-      # Convert piece by piece
-      if @iconv
-        @iconv.iconv(str.to_s) rescue str.to_s
-      else
-        if @encoding_from != @encoding_to
-          str.to_s.encode(@encoding_to, @encoding_from, invalid: :replace, undef: :replace, replace: '?')
-        else
-          str.to_s
+          associated_objects.collect { |ao| field.with(object: ao).export_value.presence || @empty }.join(',')
         end
       end
     end
diff --git a/spec/rails_admin/support/csv_converter_spec.rb b/spec/rails_admin/support/csv_converter_spec.rb
index 9cf2083e05..14e2ae591b 100644
--- a/spec/rails_admin/support/csv_converter_spec.rb
+++ b/spec/rails_admin/support/csv_converter_spec.rb
@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'spec_helper'
 
 describe RailsAdmin::CSVConverter do
@@ -15,7 +17,6 @@
     expect(RailsAdmin::CSVConverter.new(objects, schema).to_csv({})[2]).to match(/Number,Name/)
   end
 
-
   describe '#to_csv' do
     before do
       RailsAdmin.config(Player) do
@@ -24,33 +25,44 @@
           field :name
         end
       end
-
-      FactoryGirl.create :player, name: 'なまえ'
     end
 
-    let(:objects) { Player.all }
+    let(:objects) { FactoryGirl.create_list :player, 1, number: 1, name: 'なまえ' }
     let(:schema) { {only: [:number, :name]} }
 
-    subject { RailsAdmin::CSVConverter.new(objects, schema).to_csv({encoding_to: encoding}) }
+    subject { RailsAdmin::CSVConverter.new(objects, schema).to_csv(encoding_to: encoding) }
 
-    context 'encoding to UTF-8' do
+    context 'when encoding to UTF-8' do
       let(:encoding) { 'UTF-8' }
 
-      it 'should export to UTR-8 with BOM' do
+      it 'exports to UTR-8 with BOM' do
         expect(subject[1]).to eq 'UTF-8'
         expect(subject[2].encoding).to eq Encoding::UTF_8
-        expect(subject[2]).to match(/\A\xEF\xBB\xBF/)  # have BOM
+        expect(subject[2].unpack('H*').first).
+          to eq 'efbbbf4e756d6265722c4e616d650a312ce381aae381bee381880a'  # have BOM
       end
     end
 
-    context 'encoding to Shift_JIS' do
+    context 'when encoding to Shift_JIS' do
       let(:encoding) { 'Shift_JIS' }
 
-      it 'should export to Shift_JIS' do
+      it 'exports to Shift_JIS' do
         expect(subject[1]).to eq 'Shift_JIS'
         expect(subject[2].encoding).to eq Encoding::Shift_JIS
+        expect(subject[2].unpack('H*').first).
+          to eq '4e756d6265722c4e616d650a312c82c882dc82a60a'
       end
     end
 
+    context 'when encoding to UTF-16(ASCII-incompatible)' do
+      let(:encoding) { 'UTF-16' }
+
+      it 'encodes to expected byte sequence' do
+        expect(subject[1]).to eq 'UTF-16'
+        expect(subject[2].encoding).to eq Encoding::UTF_16
+        expect(subject[2].unpack('H*').first).
+          to eq 'feff004e0075006d006200650072002c004e0061006d0065000a0031002c306a307e3048000a'
+      end
+    end
   end
 end

From dcd561441ea89f85fac29283af7ae27690cd1cb3 Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Wed, 22 Oct 2014 14:10:39 +0900
Subject: [PATCH 04/87] Fix jruby build

---
 spec/rails_admin/support/csv_converter_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/rails_admin/support/csv_converter_spec.rb b/spec/rails_admin/support/csv_converter_spec.rb
index 14e2ae591b..bb5f4bf64a 100644
--- a/spec/rails_admin/support/csv_converter_spec.rb
+++ b/spec/rails_admin/support/csv_converter_spec.rb
@@ -60,7 +60,7 @@
       it 'encodes to expected byte sequence' do
         expect(subject[1]).to eq 'UTF-16'
         expect(subject[2].encoding).to eq Encoding::UTF_16
-        expect(subject[2].unpack('H*').first).
+        expect(subject[2].unpack('H*').first.force_encoding('US-ASCII')).
           to eq 'feff004e0075006d006200650072002c004e0061006d0065000a0031002c306a307e3048000a'
       end
     end

From d333271e34340d434db41c895c5d07519167a2aa Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Thu, 23 Oct 2014 13:04:07 +0900
Subject: [PATCH 05/87] Loose jquery-rails dependency. Closes #2086

---
 rails_admin.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rails_admin.gemspec b/rails_admin.gemspec
index 0fab497de7..6cdb598350 100644
--- a/rails_admin.gemspec
+++ b/rails_admin.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'coffee-rails', '~> 4.0'
   spec.add_dependency 'font-awesome-rails', ['>= 3.0', '< 5']
   spec.add_dependency 'haml', '~> 4.0'
-  spec.add_dependency 'jquery-rails', '~> 3.0'
+  spec.add_dependency 'jquery-rails', ['>= 3.0', '< 5']
   spec.add_dependency 'jquery-ui-rails', '~> 5.0'
   spec.add_dependency 'kaminari', '~> 0.14'
   spec.add_dependency 'nested_form', '~> 0.3'

From efaa1537e83070ec9b105884ddbb02c9c64324ed Mon Sep 17 00:00:00 2001
From: Nikolay Moskvin <moskvin@sibext.com>
Date: Thu, 28 Aug 2014 00:10:29 +0700
Subject: [PATCH 06/87] Replaced bootstrap 2 to bootstrap 3

---
 .../rails_admin/bootstrap/bootstrap-affix.js  |  173 +-
 .../rails_admin/bootstrap/bootstrap-alert.js  |  103 +-
 .../rails_admin/bootstrap/bootstrap-button.js |  135 +-
 .../bootstrap/bootstrap-carousel.js           |  310 +--
 .../bootstrap/bootstrap-collapse.js           |  231 +-
 .../bootstrap/bootstrap-dropdown.js           |  196 +-
 .../rails_admin/bootstrap/bootstrap-modal.js  |  383 +--
 .../bootstrap/bootstrap-popover.js            |  155 +-
 .../bootstrap/bootstrap-scrollspy.js          |  266 ++-
 .../rails_admin/bootstrap/bootstrap-tab.js    |  186 +-
 .../bootstrap/bootstrap-tooltip.js            |  632 ++---
 .../bootstrap/bootstrap-transition.js         |  103 +-
 .../bootstrap/bootstrap-typeahead.js          | 2117 ++++++++++++++---
 .../rails_admin/bootstrap/_accordion.scss     |   34 -
 .../rails_admin/bootstrap/_alerts.scss        |  105 +-
 .../rails_admin/bootstrap/_badges.scss        |   57 +
 .../rails_admin/bootstrap/_breadcrumbs.scss   |   22 +-
 .../rails_admin/bootstrap/_button-groups.scss |  315 +--
 .../rails_admin/bootstrap/_buttons.scss       |  267 +--
 .../rails_admin/bootstrap/_carousel.scss      |  217 +-
 .../rails_admin/bootstrap/_close.scss         |   19 +-
 .../rails_admin/bootstrap/_code.scss          |   65 +-
 .../bootstrap/_component-animations.scss      |   19 +-
 .../rails_admin/bootstrap/_dropdowns.scss     |  263 +-
 .../rails_admin/bootstrap/_forms.scss         |  943 +++-----
 .../rails_admin/bootstrap/_glyphicons.scss    |  237 ++
 .../rails_admin/bootstrap/_grid.scss          |   85 +-
 .../rails_admin/bootstrap/_hero-unit.scss     |   25 -
 .../rails_admin/bootstrap/_input-groups.scss  |  166 ++
 .../rails_admin/bootstrap/_jumbotron.scss     |   48 +
 .../rails_admin/bootstrap/_labels-badges.scss |   83 -
 .../rails_admin/bootstrap/_labels.scss        |   66 +
 .../rails_admin/bootstrap/_layouts.scss       |   16 -
 .../rails_admin/bootstrap/_list-group.scss    |  131 +
 .../rails_admin/bootstrap/_media.scss         |   15 +-
 .../rails_admin/bootstrap/_mixins.scss        |  729 +-----
 .../rails_admin/bootstrap/_modals.scss        |  161 +-
 .../rails_admin/bootstrap/_navbar.scss        |  928 +++++---
 .../rails_admin/bootstrap/_navs.scss          |  549 ++---
 .../rails_admin/bootstrap/_normalize.scss     |  425 ++++
 .../rails_admin/bootstrap/_pager.scss         |   78 +-
 .../rails_admin/bootstrap/_pagination.scss    |  175 +-
 .../rails_admin/bootstrap/_panels.scss        |  243 ++
 .../rails_admin/bootstrap/_popovers.scss      |  122 +-
 .../rails_admin/bootstrap/_print.scss         |  101 +
 .../rails_admin/bootstrap/_progress-bars.scss |  129 +-
 .../rails_admin/bootstrap/_reset.scss         |  216 --
 .../bootstrap/_responsive-1200px-min.scss     |   28 -
 .../bootstrap/_responsive-767px-max.scss      |  193 --
 .../bootstrap/_responsive-768px-979px.scss    |   19 -
 .../bootstrap/_responsive-embed.scss          |   34 +
 .../bootstrap/_responsive-navbar.scss         |  189 --
 .../bootstrap/_responsive-utilities.scss      |  200 +-
 .../rails_admin/bootstrap/_scaffolding.scss   |  143 +-
 .../rails_admin/bootstrap/_sprites.scss       |  197 --
 .../rails_admin/bootstrap/_tables.scss        |  338 ++-
 .../rails_admin/bootstrap/_theme.scss         |  258 ++
 .../rails_admin/bootstrap/_thumbnails.scss    |   69 +-
 .../rails_admin/bootstrap/_tooltip.scss       |   73 +-
 .../rails_admin/bootstrap/_type.scss          |  343 +--
 .../rails_admin/bootstrap/_utilities.scss     |   54 +-
 .../rails_admin/bootstrap/_variables.scss     |  979 ++++++--
 .../rails_admin/bootstrap/_wells.scss         |   14 +-
 .../rails_admin/bootstrap/bootstrap.scss      |  107 +-
 .../rails_admin/bootstrap/mixins/_alerts.scss |   14 +
 .../bootstrap/mixins/_background-variant.scss |   11 +
 .../bootstrap/mixins/_border-radius.scss      |   18 +
 .../bootstrap/mixins/_buttons.scss            |   50 +
 .../bootstrap/mixins/_center-block.scss       |    7 +
 .../bootstrap/mixins/_clearfix.scss           |   22 +
 .../rails_admin/bootstrap/mixins/_forms.scss  |   84 +
 .../bootstrap/mixins/_gradients.scss          |   58 +
 .../bootstrap/mixins/_grid-framework.scss     |   81 +
 .../rails_admin/bootstrap/mixins/_grid.scss   |  122 +
 .../bootstrap/mixins/_hide-text.scss          |   21 +
 .../rails_admin/bootstrap/mixins/_image.scss  |   34 +
 .../rails_admin/bootstrap/mixins/_labels.scss |   12 +
 .../bootstrap/mixins/_list-group.scss         |   31 +
 .../bootstrap/mixins/_nav-divider.scss        |   10 +
 .../bootstrap/mixins/_nav-vertical-align.scss |    9 +
 .../bootstrap/mixins/_opacity.scss            |    8 +
 .../bootstrap/mixins/_pagination.scss         |   23 +
 .../rails_admin/bootstrap/mixins/_panels.scss |   24 +
 .../bootstrap/mixins/_progress-bar.scss       |   10 +
 .../bootstrap/mixins/_reset-filter.scss       |    8 +
 .../rails_admin/bootstrap/mixins/_resize.scss |    6 +
 .../mixins/_responsive-visibility.scss        |   21 +
 .../rails_admin/bootstrap/mixins/_size.scss   |   10 +
 .../bootstrap/mixins/_tab-focus.scss          |    9 +
 .../bootstrap/mixins/_table-row.scss          |   28 +
 .../bootstrap/mixins/_text-emphasis.scss      |   11 +
 .../bootstrap/mixins/_text-overflow.scss      |    8 +
 .../bootstrap/mixins/_vendor-prefixes.scss    |  219 ++
 .../rails_admin/bootstrap/responsive.scss     |   48 -
 94 files changed, 9829 insertions(+), 6470 deletions(-)
 mode change 100755 => 100644 app/assets/javascripts/rails_admin/bootstrap/bootstrap-affix.js
 mode change 100755 => 100644 app/assets/javascripts/rails_admin/bootstrap/bootstrap-alert.js
 mode change 100755 => 100644 app/assets/javascripts/rails_admin/bootstrap/bootstrap-button.js
 mode change 100755 => 100644 app/assets/javascripts/rails_admin/bootstrap/bootstrap-carousel.js
 mode change 100755 => 100644 app/assets/javascripts/rails_admin/bootstrap/bootstrap-collapse.js
 mode change 100755 => 100644 app/assets/javascripts/rails_admin/bootstrap/bootstrap-dropdown.js
 mode change 100755 => 100644 app/assets/javascripts/rails_admin/bootstrap/bootstrap-modal.js
 mode change 100755 => 100644 app/assets/javascripts/rails_admin/bootstrap/bootstrap-popover.js
 mode change 100755 => 100644 app/assets/javascripts/rails_admin/bootstrap/bootstrap-scrollspy.js
 mode change 100755 => 100644 app/assets/javascripts/rails_admin/bootstrap/bootstrap-tab.js
 mode change 100755 => 100644 app/assets/javascripts/rails_admin/bootstrap/bootstrap-tooltip.js
 mode change 100755 => 100644 app/assets/javascripts/rails_admin/bootstrap/bootstrap-transition.js
 mode change 100755 => 100644 app/assets/javascripts/rails_admin/bootstrap/bootstrap-typeahead.js
 delete mode 100755 app/assets/stylesheets/rails_admin/bootstrap/_accordion.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_alerts.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/_badges.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_breadcrumbs.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_button-groups.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_buttons.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_carousel.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_close.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_code.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_component-animations.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_dropdowns.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_forms.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/_glyphicons.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_grid.scss
 delete mode 100755 app/assets/stylesheets/rails_admin/bootstrap/_hero-unit.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/_input-groups.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/_jumbotron.scss
 delete mode 100755 app/assets/stylesheets/rails_admin/bootstrap/_labels-badges.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/_labels.scss
 delete mode 100755 app/assets/stylesheets/rails_admin/bootstrap/_layouts.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/_list-group.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_media.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_mixins.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_modals.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_navbar.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_navs.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/_normalize.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_pager.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_pagination.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/_panels.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_popovers.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/_print.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_progress-bars.scss
 delete mode 100755 app/assets/stylesheets/rails_admin/bootstrap/_reset.scss
 delete mode 100755 app/assets/stylesheets/rails_admin/bootstrap/_responsive-1200px-min.scss
 delete mode 100755 app/assets/stylesheets/rails_admin/bootstrap/_responsive-767px-max.scss
 delete mode 100755 app/assets/stylesheets/rails_admin/bootstrap/_responsive-768px-979px.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/_responsive-embed.scss
 delete mode 100755 app/assets/stylesheets/rails_admin/bootstrap/_responsive-navbar.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_responsive-utilities.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_scaffolding.scss
 delete mode 100755 app/assets/stylesheets/rails_admin/bootstrap/_sprites.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_tables.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/_theme.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_thumbnails.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_tooltip.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_type.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_utilities.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_variables.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/_wells.scss
 mode change 100755 => 100644 app/assets/stylesheets/rails_admin/bootstrap/bootstrap.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_alerts.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_background-variant.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_border-radius.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_buttons.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_center-block.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_clearfix.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_forms.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_gradients.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_grid-framework.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_grid.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_hide-text.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_image.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_labels.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_list-group.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_nav-divider.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_nav-vertical-align.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_opacity.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_pagination.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_panels.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_progress-bar.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_reset-filter.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_resize.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_responsive-visibility.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_size.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_tab-focus.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_table-row.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_text-emphasis.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_text-overflow.scss
 create mode 100644 app/assets/stylesheets/rails_admin/bootstrap/mixins/_vendor-prefixes.scss
 delete mode 100755 app/assets/stylesheets/rails_admin/bootstrap/responsive.scss

diff --git a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-affix.js b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-affix.js
old mode 100755
new mode 100644
index 28d6822e71..7d404ebee5
--- a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-affix.js
+++ b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-affix.js
@@ -1,94 +1,120 @@
-/* ==========================================================
- * bootstrap-affix.js v2.3.2
- * http://getbootstrap.com/2.3.2/javascript.html#affix
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* AFFIX CLASS DEFINITION
-  * ====================== */
+/* ========================================================================
+ * Bootstrap: affix.js v3.2.0
+ * http://getbootstrap.com/javascript/#affix
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // AFFIX CLASS DEFINITION
+  // ======================
 
   var Affix = function (element, options) {
-    this.options = $.extend({}, $.fn.affix.defaults, options)
-    this.$window = $(window)
-      .on('scroll.affix.data-api', $.proxy(this.checkPosition, this))
-      .on('click.affix.data-api',  $.proxy(function () { setTimeout($.proxy(this.checkPosition, this), 1) }, this))
-    this.$element = $(element)
+    this.options = $.extend({}, Affix.DEFAULTS, options)
+
+    this.$target = $(this.options.target)
+      .on('scroll.bs.affix.data-api', $.proxy(this.checkPosition, this))
+      .on('click.bs.affix.data-api',  $.proxy(this.checkPositionWithEventLoop, this))
+
+    this.$element     = $(element)
+    this.affixed      =
+    this.unpin        =
+    this.pinnedOffset = null
+
     this.checkPosition()
   }
 
+  Affix.VERSION  = '3.2.0'
+
+  Affix.RESET    = 'affix affix-top affix-bottom'
+
+  Affix.DEFAULTS = {
+    offset: 0,
+    target: window
+  }
+
+  Affix.prototype.getPinnedOffset = function () {
+    if (this.pinnedOffset) return this.pinnedOffset
+    this.$element.removeClass(Affix.RESET).addClass('affix')
+    var scrollTop = this.$target.scrollTop()
+    var position  = this.$element.offset()
+    return (this.pinnedOffset = position.top - scrollTop)
+  }
+
+  Affix.prototype.checkPositionWithEventLoop = function () {
+    setTimeout($.proxy(this.checkPosition, this), 1)
+  }
+
   Affix.prototype.checkPosition = function () {
     if (!this.$element.is(':visible')) return
 
     var scrollHeight = $(document).height()
-      , scrollTop = this.$window.scrollTop()
-      , position = this.$element.offset()
-      , offset = this.options.offset
-      , offsetBottom = offset.bottom
-      , offsetTop = offset.top
-      , reset = 'affix affix-top affix-bottom'
-      , affix
-
-    if (typeof offset != 'object') offsetBottom = offsetTop = offset
-    if (typeof offsetTop == 'function') offsetTop = offset.top()
-    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom()
-
-    affix = this.unpin != null && (scrollTop + this.unpin <= position.top) ?
-      false    : offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ?
-      'bottom' : offsetTop != null && scrollTop <= offsetTop ?
-      'top'    : false
+    var scrollTop    = this.$target.scrollTop()
+    var position     = this.$element.offset()
+    var offset       = this.options.offset
+    var offsetTop    = offset.top
+    var offsetBottom = offset.bottom
+
+    if (typeof offset != 'object')         offsetBottom = offsetTop = offset
+    if (typeof offsetTop == 'function')    offsetTop    = offset.top(this.$element)
+    if (typeof offsetBottom == 'function') offsetBottom = offset.bottom(this.$element)
+
+    var affix = this.unpin   != null && (scrollTop + this.unpin <= position.top) ? false :
+                offsetBottom != null && (position.top + this.$element.height() >= scrollHeight - offsetBottom) ? 'bottom' :
+                offsetTop    != null && (scrollTop <= offsetTop) ? 'top' : false
 
     if (this.affixed === affix) return
+    if (this.unpin != null) this.$element.css('top', '')
 
-    this.affixed = affix
-    this.unpin = affix == 'bottom' ? position.top - scrollTop : null
+    var affixType = 'affix' + (affix ? '-' + affix : '')
+    var e         = $.Event(affixType + '.bs.affix')
 
-    this.$element.removeClass(reset).addClass('affix' + (affix ? '-' + affix : ''))
-  }
+    this.$element.trigger(e)
 
+    if (e.isDefaultPrevented()) return
 
- /* AFFIX PLUGIN DEFINITION
-  * ======================= */
+    this.affixed = affix
+    this.unpin = affix == 'bottom' ? this.getPinnedOffset() : null
+
+    this.$element
+      .removeClass(Affix.RESET)
+      .addClass(affixType)
+      .trigger($.Event(affixType.replace('affix', 'affixed')))
+
+    if (affix == 'bottom') {
+      this.$element.offset({
+        top: scrollHeight - this.$element.height() - offsetBottom
+      })
+    }
+  }
 
-  var old = $.fn.affix
 
-  $.fn.affix = function (option) {
+  // AFFIX PLUGIN DEFINITION
+  // =======================
+
+  function Plugin(option) {
     return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('affix')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('affix', (data = new Affix(this, options)))
+      var $this   = $(this)
+      var data    = $this.data('bs.affix')
+      var options = typeof option == 'object' && option
+
+      if (!data) $this.data('bs.affix', (data = new Affix(this, options)))
       if (typeof option == 'string') data[option]()
     })
   }
 
-  $.fn.affix.Constructor = Affix
+  var old = $.fn.affix
 
-  $.fn.affix.defaults = {
-    offset: 0
-  }
+  $.fn.affix             = Plugin
+  $.fn.affix.Constructor = Affix
 
 
- /* AFFIX NO CONFLICT
-  * ================= */
+  // AFFIX NO CONFLICT
+  // =================
 
   $.fn.affix.noConflict = function () {
     $.fn.affix = old
@@ -96,22 +122,21 @@
   }
 
 
- /* AFFIX DATA-API
-  * ============== */
+  // AFFIX DATA-API
+  // ==============
 
   $(window).on('load', function () {
     $('[data-spy="affix"]').each(function () {
       var $spy = $(this)
-        , data = $spy.data()
+      var data = $spy.data()
 
       data.offset = data.offset || {}
 
-      data.offsetBottom && (data.offset.bottom = data.offsetBottom)
-      data.offsetTop && (data.offset.top = data.offsetTop)
+      if (data.offsetBottom) data.offset.bottom = data.offsetBottom
+      if (data.offsetTop)    data.offset.top    = data.offsetTop
 
-      $spy.affix(data)
+      Plugin.call($spy, data)
     })
   })
 
-
-}(window.jQuery);
+}(jQuery);
diff --git a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-alert.js b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-alert.js
old mode 100755
new mode 100644
index 9a8fd77dbd..0efd92cba8
--- a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-alert.js
+++ b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-alert.js
@@ -1,89 +1,82 @@
-/* ==========================================================
- * bootstrap-alert.js v2.3.2
- * http://getbootstrap.com/2.3.2/javascript.html#alerts
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* ALERT CLASS DEFINITION
-  * ====================== */
+/* ========================================================================
+ * Bootstrap: alert.js v3.2.0
+ * http://getbootstrap.com/javascript/#alerts
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // ALERT CLASS DEFINITION
+  // ======================
 
   var dismiss = '[data-dismiss="alert"]'
-    , Alert = function (el) {
-        $(el).on('click', dismiss, this.close)
-      }
+  var Alert   = function (el) {
+    $(el).on('click', dismiss, this.close)
+  }
+
+  Alert.VERSION = '3.2.0'
 
   Alert.prototype.close = function (e) {
-    var $this = $(this)
-      , selector = $this.attr('data-target')
-      , $parent
+    var $this    = $(this)
+    var selector = $this.attr('data-target')
 
     if (!selector) {
       selector = $this.attr('href')
-      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
     }
 
-    $parent = $(selector)
+    var $parent = $(selector)
 
-    e && e.preventDefault()
+    if (e) e.preventDefault()
 
-    $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
+    if (!$parent.length) {
+      $parent = $this.hasClass('alert') ? $this : $this.parent()
+    }
 
-    $parent.trigger(e = $.Event('close'))
+    $parent.trigger(e = $.Event('close.bs.alert'))
 
     if (e.isDefaultPrevented()) return
 
     $parent.removeClass('in')
 
     function removeElement() {
-      $parent
-        .trigger('closed')
-        .remove()
+      // detach from parent, fire event then clean up data
+      $parent.detach().trigger('closed.bs.alert').remove()
     }
 
     $.support.transition && $parent.hasClass('fade') ?
-      $parent.on($.support.transition.end, removeElement) :
+      $parent
+        .one('bsTransitionEnd', removeElement)
+        .emulateTransitionEnd(150) :
       removeElement()
   }
 
 
- /* ALERT PLUGIN DEFINITION
-  * ======================= */
-
-  var old = $.fn.alert
+  // ALERT PLUGIN DEFINITION
+  // =======================
 
-  $.fn.alert = function (option) {
+  function Plugin(option) {
     return this.each(function () {
       var $this = $(this)
-        , data = $this.data('alert')
-      if (!data) $this.data('alert', (data = new Alert(this)))
+      var data  = $this.data('bs.alert')
+
+      if (!data) $this.data('bs.alert', (data = new Alert(this)))
       if (typeof option == 'string') data[option].call($this)
     })
   }
 
+  var old = $.fn.alert
+
+  $.fn.alert             = Plugin
   $.fn.alert.Constructor = Alert
 
 
- /* ALERT NO CONFLICT
-  * ================= */
+  // ALERT NO CONFLICT
+  // =================
 
   $.fn.alert.noConflict = function () {
     $.fn.alert = old
@@ -91,9 +84,9 @@
   }
 
 
- /* ALERT DATA-API
-  * ============== */
+  // ALERT DATA-API
+  // ==============
 
-  $(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
+  $(document).on('click.bs.alert.data-api', dismiss, Alert.prototype.close)
 
-}(window.jQuery);
+}(jQuery);
diff --git a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-button.js b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-button.js
old mode 100755
new mode 100644
index 953060de37..dc3164f866
--- a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-button.js
+++ b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-button.js
@@ -1,91 +1,95 @@
-/* ============================================================
- * bootstrap-button.js v2.3.2
- * http://getbootstrap.com/2.3.2/javascript.html#buttons
- * ============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* BUTTON PUBLIC CLASS DEFINITION
-  * ============================== */
+/* ========================================================================
+ * Bootstrap: button.js v3.2.0
+ * http://getbootstrap.com/javascript/#buttons
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // BUTTON PUBLIC CLASS DEFINITION
+  // ==============================
 
   var Button = function (element, options) {
-    this.$element = $(element)
-    this.options = $.extend({}, $.fn.button.defaults, options)
+    this.$element  = $(element)
+    this.options   = $.extend({}, Button.DEFAULTS, options)
+    this.isLoading = false
+  }
+
+  Button.VERSION  = '3.2.0'
+
+  Button.DEFAULTS = {
+    loadingText: 'loading...'
   }
 
   Button.prototype.setState = function (state) {
-    var d = 'disabled'
-      , $el = this.$element
-      , data = $el.data()
-      , val = $el.is('input') ? 'val' : 'html'
+    var d    = 'disabled'
+    var $el  = this.$element
+    var val  = $el.is('input') ? 'val' : 'html'
+    var data = $el.data()
 
     state = state + 'Text'
-    data.resetText || $el.data('resetText', $el[val]())
 
-    $el[val](data[state] || this.options[state])
+    if (data.resetText == null) $el.data('resetText', $el[val]())
+
+    $el[val](data[state] == null ? this.options[state] : data[state])
 
     // push to event loop to allow forms to submit
-    setTimeout(function () {
-      state == 'loadingText' ?
-        $el.addClass(d).attr(d, d) :
+    setTimeout($.proxy(function () {
+      if (state == 'loadingText') {
+        this.isLoading = true
+        $el.addClass(d).attr(d, d)
+      } else if (this.isLoading) {
+        this.isLoading = false
         $el.removeClass(d).removeAttr(d)
-    }, 0)
+      }
+    }, this), 0)
   }
 
   Button.prototype.toggle = function () {
-    var $parent = this.$element.closest('[data-toggle="buttons-radio"]')
-
-    $parent && $parent
-      .find('.active')
-      .removeClass('active')
-
-    this.$element.toggleClass('active')
+    var changed = true
+    var $parent = this.$element.closest('[data-toggle="buttons"]')
+
+    if ($parent.length) {
+      var $input = this.$element.find('input')
+      if ($input.prop('type') == 'radio') {
+        if ($input.prop('checked') && this.$element.hasClass('active')) changed = false
+        else $parent.find('.active').removeClass('active')
+      }
+      if (changed) $input.prop('checked', !this.$element.hasClass('active')).trigger('change')
+    }
+
+    if (changed) this.$element.toggleClass('active')
   }
 
 
- /* BUTTON PLUGIN DEFINITION
-  * ======================== */
-
-  var old = $.fn.button
+  // BUTTON PLUGIN DEFINITION
+  // ========================
 
-  $.fn.button = function (option) {
+  function Plugin(option) {
     return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('button')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('button', (data = new Button(this, options)))
+      var $this   = $(this)
+      var data    = $this.data('bs.button')
+      var options = typeof option == 'object' && option
+
+      if (!data) $this.data('bs.button', (data = new Button(this, options)))
+
       if (option == 'toggle') data.toggle()
       else if (option) data.setState(option)
     })
   }
 
-  $.fn.button.defaults = {
-    loadingText: 'loading...'
-  }
+  var old = $.fn.button
 
+  $.fn.button             = Plugin
   $.fn.button.Constructor = Button
 
 
- /* BUTTON NO CONFLICT
-  * ================== */
+  // BUTTON NO CONFLICT
+  // ==================
 
   $.fn.button.noConflict = function () {
     $.fn.button = old
@@ -93,13 +97,14 @@
   }
 
 
- /* BUTTON DATA-API
-  * =============== */
+  // BUTTON DATA-API
+  // ===============
 
-  $(document).on('click.button.data-api', '[data-toggle^=button]', function (e) {
+  $(document).on('click.bs.button.data-api', '[data-toggle^="button"]', function (e) {
     var $btn = $(e.target)
     if (!$btn.hasClass('btn')) $btn = $btn.closest('.btn')
-    $btn.button('toggle')
+    Plugin.call($btn, 'toggle')
+    e.preventDefault()
   })
 
-}(window.jQuery);
+}(jQuery);
diff --git a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-carousel.js b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-carousel.js
old mode 100755
new mode 100644
index 2f18aba386..b7da1ba53e
--- a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-carousel.js
+++ b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-carousel.js
@@ -1,207 +1,223 @@
-/* ==========================================================
- * bootstrap-carousel.js v2.3.2
- * http://getbootstrap.com/2.3.2/javascript.html#carousel
- * ==========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* CAROUSEL CLASS DEFINITION
-  * ========================= */
+/* ========================================================================
+ * Bootstrap: carousel.js v3.2.0
+ * http://getbootstrap.com/javascript/#carousel
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // CAROUSEL CLASS DEFINITION
+  // =========================
 
   var Carousel = function (element, options) {
-    this.$element = $(element)
+    this.$element    = $(element).on('keydown.bs.carousel', $.proxy(this.keydown, this))
     this.$indicators = this.$element.find('.carousel-indicators')
-    this.options = options
+    this.options     = options
+    this.paused      =
+    this.sliding     =
+    this.interval    =
+    this.$active     =
+    this.$items      = null
+
     this.options.pause == 'hover' && this.$element
-      .on('mouseenter', $.proxy(this.pause, this))
-      .on('mouseleave', $.proxy(this.cycle, this))
+      .on('mouseenter.bs.carousel', $.proxy(this.pause, this))
+      .on('mouseleave.bs.carousel', $.proxy(this.cycle, this))
   }
 
-  Carousel.prototype = {
+  Carousel.VERSION  = '3.2.0'
 
-    cycle: function (e) {
-      if (!e) this.paused = false
-      if (this.interval) clearInterval(this.interval);
-      this.options.interval
-        && !this.paused
-        && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
-      return this
-    }
+  Carousel.DEFAULTS = {
+    interval: 5000,
+    pause: 'hover',
+    wrap: true
+  }
 
-  , getActiveIndex: function () {
-      this.$active = this.$element.find('.item.active')
-      this.$items = this.$active.parent().children()
-      return this.$items.index(this.$active)
+  Carousel.prototype.keydown = function (e) {
+    switch (e.which) {
+      case 37: this.prev(); break
+      case 39: this.next(); break
+      default: return
     }
 
-  , to: function (pos) {
-      var activeIndex = this.getActiveIndex()
-        , that = this
+    e.preventDefault()
+  }
 
-      if (pos > (this.$items.length - 1) || pos < 0) return
+  Carousel.prototype.cycle = function (e) {
+    e || (this.paused = false)
 
-      if (this.sliding) {
-        return this.$element.one('slid', function () {
-          that.to(pos)
-        })
-      }
+    this.interval && clearInterval(this.interval)
 
-      if (activeIndex == pos) {
-        return this.pause().cycle()
-      }
+    this.options.interval
+      && !this.paused
+      && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
 
-      return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
-    }
+    return this
+  }
 
-  , pause: function (e) {
-      if (!e) this.paused = true
-      if (this.$element.find('.next, .prev').length && $.support.transition.end) {
-        this.$element.trigger($.support.transition.end)
-        this.cycle(true)
-      }
-      clearInterval(this.interval)
-      this.interval = null
-      return this
-    }
+  Carousel.prototype.getItemIndex = function (item) {
+    this.$items = item.parent().children('.item')
+    return this.$items.index(item || this.$active)
+  }
 
-  , next: function () {
-      if (this.sliding) return
-      return this.slide('next')
-    }
+  Carousel.prototype.to = function (pos) {
+    var that        = this
+    var activeIndex = this.getItemIndex(this.$active = this.$element.find('.item.active'))
+
+    if (pos > (this.$items.length - 1) || pos < 0) return
+
+    if (this.sliding)       return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) // yes, "slid"
+    if (activeIndex == pos) return this.pause().cycle()
 
-  , prev: function () {
-      if (this.sliding) return
-      return this.slide('prev')
+    return this.slide(pos > activeIndex ? 'next' : 'prev', $(this.$items[pos]))
+  }
+
+  Carousel.prototype.pause = function (e) {
+    e || (this.paused = true)
+
+    if (this.$element.find('.next, .prev').length && $.support.transition) {
+      this.$element.trigger($.support.transition.end)
+      this.cycle(true)
     }
 
-  , slide: function (type, next) {
-      var $active = this.$element.find('.item.active')
-        , $next = next || $active[type]()
-        , isCycling = this.interval
-        , direction = type == 'next' ? 'left' : 'right'
-        , fallback  = type == 'next' ? 'first' : 'last'
-        , that = this
-        , e
+    this.interval = clearInterval(this.interval)
 
-      this.sliding = true
+    return this
+  }
 
-      isCycling && this.pause()
+  Carousel.prototype.next = function () {
+    if (this.sliding) return
+    return this.slide('next')
+  }
+
+  Carousel.prototype.prev = function () {
+    if (this.sliding) return
+    return this.slide('prev')
+  }
 
-      $next = $next.length ? $next : this.$element.find('.item')[fallback]()
+  Carousel.prototype.slide = function (type, next) {
+    var $active   = this.$element.find('.item.active')
+    var $next     = next || $active[type]()
+    var isCycling = this.interval
+    var direction = type == 'next' ? 'left' : 'right'
+    var fallback  = type == 'next' ? 'first' : 'last'
+    var that      = this
+
+    if (!$next.length) {
+      if (!this.options.wrap) return
+      $next = this.$element.find('.item')[fallback]()
+    }
 
-      e = $.Event('slide', {
-        relatedTarget: $next[0]
-      , direction: direction
-      })
+    if ($next.hasClass('active')) return (this.sliding = false)
 
-      if ($next.hasClass('active')) return
+    var relatedTarget = $next[0]
+    var slideEvent = $.Event('slide.bs.carousel', {
+      relatedTarget: relatedTarget,
+      direction: direction
+    })
+    this.$element.trigger(slideEvent)
+    if (slideEvent.isDefaultPrevented()) return
 
-      if (this.$indicators.length) {
-        this.$indicators.find('.active').removeClass('active')
-        this.$element.one('slid', function () {
-          var $nextIndicator = $(that.$indicators.children()[that.getActiveIndex()])
-          $nextIndicator && $nextIndicator.addClass('active')
-        })
-      }
-
-      if ($.support.transition && this.$element.hasClass('slide')) {
-        this.$element.trigger(e)
-        if (e.isDefaultPrevented()) return
-        $next.addClass(type)
-        $next[0].offsetWidth // force reflow
-        $active.addClass(direction)
-        $next.addClass(direction)
-        this.$element.one($.support.transition.end, function () {
+    this.sliding = true
+
+    isCycling && this.pause()
+
+    if (this.$indicators.length) {
+      this.$indicators.find('.active').removeClass('active')
+      var $nextIndicator = $(this.$indicators.children()[this.getItemIndex($next)])
+      $nextIndicator && $nextIndicator.addClass('active')
+    }
+
+    var slidEvent = $.Event('slid.bs.carousel', { relatedTarget: relatedTarget, direction: direction }) // yes, "slid"
+    if ($.support.transition && this.$element.hasClass('slide')) {
+      $next.addClass(type)
+      $next[0].offsetWidth // force reflow
+      $active.addClass(direction)
+      $next.addClass(direction)
+      $active
+        .one('bsTransitionEnd', function () {
           $next.removeClass([type, direction].join(' ')).addClass('active')
           $active.removeClass(['active', direction].join(' '))
           that.sliding = false
-          setTimeout(function () { that.$element.trigger('slid') }, 0)
+          setTimeout(function () {
+            that.$element.trigger(slidEvent)
+          }, 0)
         })
-      } else {
-        this.$element.trigger(e)
-        if (e.isDefaultPrevented()) return
-        $active.removeClass('active')
-        $next.addClass('active')
-        this.sliding = false
-        this.$element.trigger('slid')
-      }
-
-      isCycling && this.cycle()
-
-      return this
+        .emulateTransitionEnd($active.css('transition-duration').slice(0, -1) * 1000)
+    } else {
+      $active.removeClass('active')
+      $next.addClass('active')
+      this.sliding = false
+      this.$element.trigger(slidEvent)
     }
 
-  }
+    isCycling && this.cycle()
 
+    return this
+  }
 
- /* CAROUSEL PLUGIN DEFINITION
-  * ========================== */
 
-  var old = $.fn.carousel
+  // CAROUSEL PLUGIN DEFINITION
+  // ==========================
 
-  $.fn.carousel = function (option) {
+  function Plugin(option) {
     return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('carousel')
-        , options = $.extend({}, $.fn.carousel.defaults, typeof option == 'object' && option)
-        , action = typeof option == 'string' ? option : options.slide
-      if (!data) $this.data('carousel', (data = new Carousel(this, options)))
+      var $this   = $(this)
+      var data    = $this.data('bs.carousel')
+      var options = $.extend({}, Carousel.DEFAULTS, $this.data(), typeof option == 'object' && option)
+      var action  = typeof option == 'string' ? option : options.slide
+
+      if (!data) $this.data('bs.carousel', (data = new Carousel(this, options)))
       if (typeof option == 'number') data.to(option)
       else if (action) data[action]()
       else if (options.interval) data.pause().cycle()
     })
   }
 
-  $.fn.carousel.defaults = {
-    interval: 5000
-  , pause: 'hover'
-  }
+  var old = $.fn.carousel
 
+  $.fn.carousel             = Plugin
   $.fn.carousel.Constructor = Carousel
 
 
- /* CAROUSEL NO CONFLICT
-  * ==================== */
+  // CAROUSEL NO CONFLICT
+  // ====================
 
   $.fn.carousel.noConflict = function () {
     $.fn.carousel = old
     return this
   }
 
- /* CAROUSEL DATA-API
-  * ================= */
 
-  $(document).on('click.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
-    var $this = $(this), href
-      , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-      , options = $.extend({}, $target.data(), $this.data())
-      , slideIndex
+  // CAROUSEL DATA-API
+  // =================
+
+  $(document).on('click.bs.carousel.data-api', '[data-slide], [data-slide-to]', function (e) {
+    var href
+    var $this   = $(this)
+    var $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) // strip for ie7
+    if (!$target.hasClass('carousel')) return
+    var options = $.extend({}, $target.data(), $this.data())
+    var slideIndex = $this.attr('data-slide-to')
+    if (slideIndex) options.interval = false
 
-    $target.carousel(options)
+    Plugin.call($target, options)
 
-    if (slideIndex = $this.attr('data-slide-to')) {
-      $target.data('carousel').pause().to(slideIndex).cycle()
+    if (slideIndex) {
+      $target.data('bs.carousel').to(slideIndex)
     }
 
     e.preventDefault()
   })
 
-}(window.jQuery);
+  $(window).on('load', function () {
+    $('[data-ride="carousel"]').each(function () {
+      var $carousel = $(this)
+      Plugin.call($carousel, $carousel.data())
+    })
+  })
+
+}(jQuery);
diff --git a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-collapse.js b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-collapse.js
old mode 100755
new mode 100644
index 47baa02a85..e4e6d79333
--- a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-collapse.js
+++ b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-collapse.js
@@ -1,149 +1,142 @@
-/* =============================================================
- * bootstrap-collapse.js v2.3.2
- * http://getbootstrap.com/2.3.2/javascript.html#collapse
- * =============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* COLLAPSE PUBLIC CLASS DEFINITION
-  * ================================ */
+/* ========================================================================
+ * Bootstrap: collapse.js v3.2.0
+ * http://getbootstrap.com/javascript/#collapse
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // COLLAPSE PUBLIC CLASS DEFINITION
+  // ================================
 
   var Collapse = function (element, options) {
-    this.$element = $(element)
-    this.options = $.extend({}, $.fn.collapse.defaults, options)
+    this.$element      = $(element)
+    this.options       = $.extend({}, Collapse.DEFAULTS, options)
+    this.transitioning = null
 
-    if (this.options.parent) {
-      this.$parent = $(this.options.parent)
-    }
+    if (this.options.parent) this.$parent = $(this.options.parent)
+    if (this.options.toggle) this.toggle()
+  }
+
+  Collapse.VERSION  = '3.2.0'
 
-    this.options.toggle && this.toggle()
+  Collapse.DEFAULTS = {
+    toggle: true
   }
 
-  Collapse.prototype = {
+  Collapse.prototype.dimension = function () {
+    var hasWidth = this.$element.hasClass('width')
+    return hasWidth ? 'width' : 'height'
+  }
 
-    constructor: Collapse
+  Collapse.prototype.show = function () {
+    if (this.transitioning || this.$element.hasClass('in')) return
 
-  , dimension: function () {
-      var hasWidth = this.$element.hasClass('width')
-      return hasWidth ? 'width' : 'height'
-    }
+    var startEvent = $.Event('show.bs.collapse')
+    this.$element.trigger(startEvent)
+    if (startEvent.isDefaultPrevented()) return
 
-  , show: function () {
-      var dimension
-        , scroll
-        , actives
-        , hasData
+    var actives = this.$parent && this.$parent.find('> .panel > .in')
 
-      if (this.transitioning || this.$element.hasClass('in')) return
+    if (actives && actives.length) {
+      var hasData = actives.data('bs.collapse')
+      if (hasData && hasData.transitioning) return
+      Plugin.call(actives, 'hide')
+      hasData || actives.data('bs.collapse', null)
+    }
 
-      dimension = this.dimension()
-      scroll = $.camelCase(['scroll', dimension].join('-'))
-      actives = this.$parent && this.$parent.find('> .accordion-group > .in')
+    var dimension = this.dimension()
 
-      if (actives && actives.length) {
-        hasData = actives.data('collapse')
-        if (hasData && hasData.transitioning) return
-        actives.collapse('hide')
-        hasData || actives.data('collapse', null)
-      }
+    this.$element
+      .removeClass('collapse')
+      .addClass('collapsing')[dimension](0)
 
-      this.$element[dimension](0)
-      this.transition('addClass', $.Event('show'), 'shown')
-      $.support.transition && this.$element[dimension](this.$element[0][scroll])
-    }
+    this.transitioning = 1
 
-  , hide: function () {
-      var dimension
-      if (this.transitioning || !this.$element.hasClass('in')) return
-      dimension = this.dimension()
-      this.reset(this.$element[dimension]())
-      this.transition('removeClass', $.Event('hide'), 'hidden')
-      this.$element[dimension](0)
+    var complete = function () {
+      this.$element
+        .removeClass('collapsing')
+        .addClass('collapse in')[dimension]('')
+      this.transitioning = 0
+      this.$element
+        .trigger('shown.bs.collapse')
     }
 
-  , reset: function (size) {
-      var dimension = this.dimension()
+    if (!$.support.transition) return complete.call(this)
 
-      this.$element
-        .removeClass('collapse')
-        [dimension](size || 'auto')
-        [0].offsetWidth
+    var scrollSize = $.camelCase(['scroll', dimension].join('-'))
 
-      this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
+    this.$element
+      .one('bsTransitionEnd', $.proxy(complete, this))
+      .emulateTransitionEnd(350)[dimension](this.$element[0][scrollSize])
+  }
 
-      return this
-    }
+  Collapse.prototype.hide = function () {
+    if (this.transitioning || !this.$element.hasClass('in')) return
 
-  , transition: function (method, startEvent, completeEvent) {
-      var that = this
-        , complete = function () {
-            if (startEvent.type == 'show') that.reset()
-            that.transitioning = 0
-            that.$element.trigger(completeEvent)
-          }
+    var startEvent = $.Event('hide.bs.collapse')
+    this.$element.trigger(startEvent)
+    if (startEvent.isDefaultPrevented()) return
 
-      this.$element.trigger(startEvent)
+    var dimension = this.dimension()
 
-      if (startEvent.isDefaultPrevented()) return
+    this.$element[dimension](this.$element[dimension]())[0].offsetHeight
 
-      this.transitioning = 1
+    this.$element
+      .addClass('collapsing')
+      .removeClass('collapse')
+      .removeClass('in')
 
-      this.$element[method]('in')
+    this.transitioning = 1
 
-      $.support.transition && this.$element.hasClass('collapse') ?
-        this.$element.one($.support.transition.end, complete) :
-        complete()
+    var complete = function () {
+      this.transitioning = 0
+      this.$element
+        .trigger('hidden.bs.collapse')
+        .removeClass('collapsing')
+        .addClass('collapse')
     }
 
-  , toggle: function () {
-      this[this.$element.hasClass('in') ? 'hide' : 'show']()
-    }
+    if (!$.support.transition) return complete.call(this)
 
+    this.$element
+      [dimension](0)
+      .one('bsTransitionEnd', $.proxy(complete, this))
+      .emulateTransitionEnd(350)
   }
 
+  Collapse.prototype.toggle = function () {
+    this[this.$element.hasClass('in') ? 'hide' : 'show']()
+  }
 
- /* COLLAPSE PLUGIN DEFINITION
-  * ========================== */
 
-  var old = $.fn.collapse
+  // COLLAPSE PLUGIN DEFINITION
+  // ==========================
 
-  $.fn.collapse = function (option) {
+  function Plugin(option) {
     return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('collapse')
-        , options = $.extend({}, $.fn.collapse.defaults, $this.data(), typeof option == 'object' && option)
-      if (!data) $this.data('collapse', (data = new Collapse(this, options)))
+      var $this   = $(this)
+      var data    = $this.data('bs.collapse')
+      var options = $.extend({}, Collapse.DEFAULTS, $this.data(), typeof option == 'object' && option)
+
+      if (!data && options.toggle && option == 'show') option = !option
+      if (!data) $this.data('bs.collapse', (data = new Collapse(this, options)))
       if (typeof option == 'string') data[option]()
     })
   }
 
-  $.fn.collapse.defaults = {
-    toggle: true
-  }
+  var old = $.fn.collapse
 
+  $.fn.collapse             = Plugin
   $.fn.collapse.Constructor = Collapse
 
 
- /* COLLAPSE NO CONFLICT
-  * ==================== */
+  // COLLAPSE NO CONFLICT
+  // ====================
 
   $.fn.collapse.noConflict = function () {
     $.fn.collapse = old
@@ -151,17 +144,27 @@
   }
 
 
- /* COLLAPSE DATA-API
-  * ================= */
+  // COLLAPSE DATA-API
+  // =================
 
-  $(document).on('click.collapse.data-api', '[data-toggle=collapse]', function (e) {
-    var $this = $(this), href
-      , target = $this.attr('data-target')
+  $(document).on('click.bs.collapse.data-api', '[data-toggle="collapse"]', function (e) {
+    var href
+    var $this   = $(this)
+    var target  = $this.attr('data-target')
         || e.preventDefault()
-        || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
-      , option = $(target).data('collapse') ? 'toggle' : $this.data()
-    $this[$(target).hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
-    $(target).collapse(option)
+        || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7
+    var $target = $(target)
+    var data    = $target.data('bs.collapse')
+    var option  = data ? 'toggle' : $this.data()
+    var parent  = $this.attr('data-parent')
+    var $parent = parent && $(parent)
+
+    if (!data || !data.transitioning) {
+      if ($parent) $parent.find('[data-toggle="collapse"][data-parent="' + parent + '"]').not($this).addClass('collapsed')
+      $this[$target.hasClass('in') ? 'addClass' : 'removeClass']('collapsed')
+    }
+
+    Plugin.call($target, option)
   })
 
-}(window.jQuery);
+}(jQuery);
diff --git a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-dropdown.js b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-dropdown.js
old mode 100755
new mode 100644
index 2239491f01..88f118c2d3
--- a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-dropdown.js
+++ b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-dropdown.js
@@ -1,155 +1,137 @@
-/* ============================================================
- * bootstrap-dropdown.js v2.3.2
- * http://getbootstrap.com/2.3.2/javascript.html#dropdowns
- * ============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* DROPDOWN CLASS DEFINITION
-  * ========================= */
-
-  var toggle = '[data-toggle=dropdown]'
-    , Dropdown = function (element) {
-        var $el = $(element).on('click.dropdown.data-api', this.toggle)
-        $('html').on('click.dropdown.data-api', function () {
-          $el.parent().removeClass('open')
-        })
-      }
+/* ========================================================================
+ * Bootstrap: dropdown.js v3.2.0
+ * http://getbootstrap.com/javascript/#dropdowns
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
 
-  Dropdown.prototype = {
 
-    constructor: Dropdown
++function ($) {
+  'use strict';
 
-  , toggle: function (e) {
-      var $this = $(this)
-        , $parent
-        , isActive
+  // DROPDOWN CLASS DEFINITION
+  // =========================
+
+  var backdrop = '.dropdown-backdrop'
+  var toggle   = '[data-toggle="dropdown"]'
+  var Dropdown = function (element) {
+    $(element).on('click.bs.dropdown', this.toggle)
+  }
+
+  Dropdown.VERSION = '3.2.0'
 
-      if ($this.is('.disabled, :disabled')) return
+  Dropdown.prototype.toggle = function (e) {
+    var $this = $(this)
 
-      $parent = getParent($this)
+    if ($this.is('.disabled, :disabled')) return
 
-      isActive = $parent.hasClass('open')
+    var $parent  = getParent($this)
+    var isActive = $parent.hasClass('open')
 
-      clearMenus()
+    clearMenus()
 
-      if (!isActive) {
-        if ('ontouchstart' in document.documentElement) {
-          // if mobile we we use a backdrop because click events don't delegate
-          $('<div class="dropdown-backdrop"/>').insertBefore($(this)).on('click', clearMenus)
-        }
-        $parent.toggleClass('open')
+    if (!isActive) {
+      if ('ontouchstart' in document.documentElement && !$parent.closest('.navbar-nav').length) {
+        // if mobile we use a backdrop because click events don't delegate
+        $('<div class="dropdown-backdrop"/>').insertAfter($(this)).on('click', clearMenus)
       }
 
-      $this.focus()
+      var relatedTarget = { relatedTarget: this }
+      $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget))
 
-      return false
-    }
+      if (e.isDefaultPrevented()) return
 
-  , keydown: function (e) {
-      var $this
-        , $items
-        , $active
-        , $parent
-        , isActive
-        , index
+      $this.trigger('focus')
 
-      if (!/(38|40|27)/.test(e.keyCode)) return
+      $parent
+        .toggleClass('open')
+        .trigger('shown.bs.dropdown', relatedTarget)
+    }
 
-      $this = $(this)
+    return false
+  }
 
-      e.preventDefault()
-      e.stopPropagation()
+  Dropdown.prototype.keydown = function (e) {
+    if (!/(38|40|27)/.test(e.keyCode)) return
 
-      if ($this.is('.disabled, :disabled')) return
+    var $this = $(this)
 
-      $parent = getParent($this)
+    e.preventDefault()
+    e.stopPropagation()
 
-      isActive = $parent.hasClass('open')
+    if ($this.is('.disabled, :disabled')) return
 
-      if (!isActive || (isActive && e.keyCode == 27)) {
-        if (e.which == 27) $parent.find(toggle).focus()
-        return $this.click()
-      }
+    var $parent  = getParent($this)
+    var isActive = $parent.hasClass('open')
 
-      $items = $('[role=menu] li:not(.divider):visible a', $parent)
+    if (!isActive || (isActive && e.keyCode == 27)) {
+      if (e.which == 27) $parent.find(toggle).trigger('focus')
+      return $this.trigger('click')
+    }
 
-      if (!$items.length) return
+    var desc = ' li:not(.divider):visible a'
+    var $items = $parent.find('[role="menu"]' + desc + ', [role="listbox"]' + desc)
 
-      index = $items.index($items.filter(':focus'))
+    if (!$items.length) return
 
-      if (e.keyCode == 38 && index > 0) index--                                        // up
-      if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
-      if (!~index) index = 0
+    var index = $items.index($items.filter(':focus'))
 
-      $items
-        .eq(index)
-        .focus()
-    }
+    if (e.keyCode == 38 && index > 0)                 index--                        // up
+    if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
+    if (!~index)                                      index = 0
 
+    $items.eq(index).trigger('focus')
   }
 
-  function clearMenus() {
-    $('.dropdown-backdrop').remove()
+  function clearMenus(e) {
+    if (e && e.which === 3) return
+    $(backdrop).remove()
     $(toggle).each(function () {
-      getParent($(this)).removeClass('open')
+      var $parent = getParent($(this))
+      var relatedTarget = { relatedTarget: this }
+      if (!$parent.hasClass('open')) return
+      $parent.trigger(e = $.Event('hide.bs.dropdown', relatedTarget))
+      if (e.isDefaultPrevented()) return
+      $parent.removeClass('open').trigger('hidden.bs.dropdown', relatedTarget)
     })
   }
 
   function getParent($this) {
     var selector = $this.attr('data-target')
-      , $parent
 
     if (!selector) {
       selector = $this.attr('href')
-      selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+      selector = selector && /#[A-Za-z]/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
     }
 
-    $parent = selector && $(selector)
+    var $parent = selector && $(selector)
 
-    if (!$parent || !$parent.length) $parent = $this.parent()
-
-    return $parent
+    return $parent && $parent.length ? $parent : $this.parent()
   }
 
 
-  /* DROPDOWN PLUGIN DEFINITION
-   * ========================== */
-
-  var old = $.fn.dropdown
+  // DROPDOWN PLUGIN DEFINITION
+  // ==========================
 
-  $.fn.dropdown = function (option) {
+  function Plugin(option) {
     return this.each(function () {
       var $this = $(this)
-        , data = $this.data('dropdown')
-      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+      var data  = $this.data('bs.dropdown')
+
+      if (!data) $this.data('bs.dropdown', (data = new Dropdown(this)))
       if (typeof option == 'string') data[option].call($this)
     })
   }
 
+  var old = $.fn.dropdown
+
+  $.fn.dropdown             = Plugin
   $.fn.dropdown.Constructor = Dropdown
 
 
- /* DROPDOWN NO CONFLICT
-  * ==================== */
+  // DROPDOWN NO CONFLICT
+  // ====================
 
   $.fn.dropdown.noConflict = function () {
     $.fn.dropdown = old
@@ -157,13 +139,13 @@
   }
 
 
-  /* APPLY TO STANDARD DROPDOWN ELEMENTS
-   * =================================== */
+  // APPLY TO STANDARD DROPDOWN ELEMENTS
+  // ===================================
 
   $(document)
-    .on('click.dropdown.data-api', clearMenus)
-    .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('click.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
-    .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
+    .on('click.bs.dropdown.data-api', clearMenus)
+    .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
+    .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
+    .on('keydown.bs.dropdown.data-api', toggle + ', [role="menu"], [role="listbox"]', Dropdown.prototype.keydown)
 
-}(window.jQuery);
+}(jQuery);
diff --git a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-modal.js b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-modal.js
old mode 100755
new mode 100644
index f45b991c8b..29eedf117a
--- a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-modal.js
+++ b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-modal.js
@@ -1,224 +1,255 @@
-/* =========================================================
- * bootstrap-modal.js v2.3.2
- * http://getbootstrap.com/2.3.2/javascript.html#modals
- * =========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================= */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* MODAL CLASS DEFINITION
-  * ====================== */
+/* ========================================================================
+ * Bootstrap: modal.js v3.2.0
+ * http://getbootstrap.com/javascript/#modals
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // MODAL CLASS DEFINITION
+  // ======================
 
   var Modal = function (element, options) {
-    this.options = options
-    this.$element = $(element)
-      .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
-    this.options.remote && this.$element.find('.modal-body').load(this.options.remote)
+    this.options        = options
+    this.$body          = $(document.body)
+    this.$element       = $(element)
+    this.$backdrop      =
+    this.isShown        = null
+    this.scrollbarWidth = 0
+
+    if (this.options.remote) {
+      this.$element
+        .find('.modal-content')
+        .load(this.options.remote, $.proxy(function () {
+          this.$element.trigger('loaded.bs.modal')
+        }, this))
+    }
   }
 
-  Modal.prototype = {
+  Modal.VERSION  = '3.2.0'
 
-      constructor: Modal
+  Modal.DEFAULTS = {
+    backdrop: true,
+    keyboard: true,
+    show: true
+  }
 
-    , toggle: function () {
-        return this[!this.isShown ? 'show' : 'hide']()
-      }
+  Modal.prototype.toggle = function (_relatedTarget) {
+    return this.isShown ? this.hide() : this.show(_relatedTarget)
+  }
 
-    , show: function () {
-        var that = this
-          , e = $.Event('show')
+  Modal.prototype.show = function (_relatedTarget) {
+    var that = this
+    var e    = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
 
-        this.$element.trigger(e)
+    this.$element.trigger(e)
 
-        if (this.isShown || e.isDefaultPrevented()) return
+    if (this.isShown || e.isDefaultPrevented()) return
 
-        this.isShown = true
+    this.isShown = true
 
-        this.escape()
+    this.checkScrollbar()
+    this.$body.addClass('modal-open')
 
-        this.backdrop(function () {
-          var transition = $.support.transition && that.$element.hasClass('fade')
+    this.setScrollbar()
+    this.escape()
 
-          if (!that.$element.parent().length) {
-            that.$element.appendTo(document.body) //don't move modals dom position
-          }
+    this.$element.on('click.dismiss.bs.modal', '[data-dismiss="modal"]', $.proxy(this.hide, this))
 
-          that.$element.show()
+    this.backdrop(function () {
+      var transition = $.support.transition && that.$element.hasClass('fade')
 
-          if (transition) {
-            that.$element[0].offsetWidth // force reflow
-          }
+      if (!that.$element.parent().length) {
+        that.$element.appendTo(that.$body) // don't move modals dom position
+      }
 
-          that.$element
-            .addClass('in')
-            .attr('aria-hidden', false)
+      that.$element
+        .show()
+        .scrollTop(0)
 
-          that.enforceFocus()
+      if (transition) {
+        that.$element[0].offsetWidth // force reflow
+      }
 
-          transition ?
-            that.$element.one($.support.transition.end, function () { that.$element.focus().trigger('shown') }) :
-            that.$element.focus().trigger('shown')
+      that.$element
+        .addClass('in')
+        .attr('aria-hidden', false)
 
-        })
-      }
+      that.enforceFocus()
+
+      var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
 
-    , hide: function (e) {
-        e && e.preventDefault()
+      transition ?
+        that.$element.find('.modal-dialog') // wait for modal to slide in
+          .one('bsTransitionEnd', function () {
+            that.$element.trigger('focus').trigger(e)
+          })
+          .emulateTransitionEnd(300) :
+        that.$element.trigger('focus').trigger(e)
+    })
+  }
 
-        var that = this
+  Modal.prototype.hide = function (e) {
+    if (e) e.preventDefault()
 
-        e = $.Event('hide')
+    e = $.Event('hide.bs.modal')
 
-        this.$element.trigger(e)
+    this.$element.trigger(e)
 
-        if (!this.isShown || e.isDefaultPrevented()) return
+    if (!this.isShown || e.isDefaultPrevented()) return
 
-        this.isShown = false
+    this.isShown = false
 
-        this.escape()
+    this.$body.removeClass('modal-open')
 
-        $(document).off('focusin.modal')
+    this.resetScrollbar()
+    this.escape()
 
-        this.$element
-          .removeClass('in')
-          .attr('aria-hidden', true)
+    $(document).off('focusin.bs.modal')
 
-        $.support.transition && this.$element.hasClass('fade') ?
-          this.hideWithTransition() :
-          this.hideModal()
-      }
+    this.$element
+      .removeClass('in')
+      .attr('aria-hidden', true)
+      .off('click.dismiss.bs.modal')
 
-    , enforceFocus: function () {
-        var that = this
-        $(document).on('focusin.modal', function (e) {
-          if (that.$element[0] !== e.target && !that.$element.has(e.target).length) {
-            that.$element.focus()
-          }
-        })
-      }
+    $.support.transition && this.$element.hasClass('fade') ?
+      this.$element
+        .one('bsTransitionEnd', $.proxy(this.hideModal, this))
+        .emulateTransitionEnd(300) :
+      this.hideModal()
+  }
 
-    , escape: function () {
-        var that = this
-        if (this.isShown && this.options.keyboard) {
-          this.$element.on('keyup.dismiss.modal', function ( e ) {
-            e.which == 27 && that.hide()
-          })
-        } else if (!this.isShown) {
-          this.$element.off('keyup.dismiss.modal')
+  Modal.prototype.enforceFocus = function () {
+    $(document)
+      .off('focusin.bs.modal') // guard against infinite focus loop
+      .on('focusin.bs.modal', $.proxy(function (e) {
+        if (this.$element[0] !== e.target && !this.$element.has(e.target).length) {
+          this.$element.trigger('focus')
         }
-      }
-
-    , hideWithTransition: function () {
-        var that = this
-          , timeout = setTimeout(function () {
-              that.$element.off($.support.transition.end)
-              that.hideModal()
-            }, 500)
-
-        this.$element.one($.support.transition.end, function () {
-          clearTimeout(timeout)
-          that.hideModal()
-        })
-      }
+      }, this))
+  }
 
-    , hideModal: function () {
-        var that = this
-        this.$element.hide()
-        this.backdrop(function () {
-          that.removeBackdrop()
-          that.$element.trigger('hidden')
-        })
-      }
+  Modal.prototype.escape = function () {
+    if (this.isShown && this.options.keyboard) {
+      this.$element.on('keyup.dismiss.bs.modal', $.proxy(function (e) {
+        e.which == 27 && this.hide()
+      }, this))
+    } else if (!this.isShown) {
+      this.$element.off('keyup.dismiss.bs.modal')
+    }
+  }
 
-    , removeBackdrop: function () {
-        this.$backdrop && this.$backdrop.remove()
-        this.$backdrop = null
-      }
+  Modal.prototype.hideModal = function () {
+    var that = this
+    this.$element.hide()
+    this.backdrop(function () {
+      that.$element.trigger('hidden.bs.modal')
+    })
+  }
 
-    , backdrop: function (callback) {
-        var that = this
-          , animate = this.$element.hasClass('fade') ? 'fade' : ''
+  Modal.prototype.removeBackdrop = function () {
+    this.$backdrop && this.$backdrop.remove()
+    this.$backdrop = null
+  }
 
-        if (this.isShown && this.options.backdrop) {
-          var doAnimate = $.support.transition && animate
+  Modal.prototype.backdrop = function (callback) {
+    var that = this
+    var animate = this.$element.hasClass('fade') ? 'fade' : ''
 
-          this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
-            .appendTo(document.body)
+    if (this.isShown && this.options.backdrop) {
+      var doAnimate = $.support.transition && animate
 
-          this.$backdrop.click(
-            this.options.backdrop == 'static' ?
-              $.proxy(this.$element[0].focus, this.$element[0])
-            : $.proxy(this.hide, this)
-          )
+      this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
+        .appendTo(this.$body)
 
-          if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+      this.$element.on('click.dismiss.bs.modal', $.proxy(function (e) {
+        if (e.target !== e.currentTarget) return
+        this.options.backdrop == 'static'
+          ? this.$element[0].focus.call(this.$element[0])
+          : this.hide.call(this)
+      }, this))
 
-          this.$backdrop.addClass('in')
+      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
 
-          if (!callback) return
+      this.$backdrop.addClass('in')
 
-          doAnimate ?
-            this.$backdrop.one($.support.transition.end, callback) :
-            callback()
+      if (!callback) return
 
-        } else if (!this.isShown && this.$backdrop) {
-          this.$backdrop.removeClass('in')
+      doAnimate ?
+        this.$backdrop
+          .one('bsTransitionEnd', callback)
+          .emulateTransitionEnd(150) :
+        callback()
 
-          $.support.transition && this.$element.hasClass('fade')?
-            this.$backdrop.one($.support.transition.end, callback) :
-            callback()
+    } else if (!this.isShown && this.$backdrop) {
+      this.$backdrop.removeClass('in')
 
-        } else if (callback) {
-          callback()
-        }
+      var callbackRemove = function () {
+        that.removeBackdrop()
+        callback && callback()
       }
+      $.support.transition && this.$element.hasClass('fade') ?
+        this.$backdrop
+          .one('bsTransitionEnd', callbackRemove)
+          .emulateTransitionEnd(150) :
+        callbackRemove()
+
+    } else if (callback) {
+      callback()
+    }
+  }
+
+  Modal.prototype.checkScrollbar = function () {
+    if (document.body.clientWidth >= window.innerWidth) return
+    this.scrollbarWidth = this.scrollbarWidth || this.measureScrollbar()
   }
 
+  Modal.prototype.setScrollbar = function () {
+    var bodyPad = parseInt((this.$body.css('padding-right') || 0), 10)
+    if (this.scrollbarWidth) this.$body.css('padding-right', bodyPad + this.scrollbarWidth)
+  }
 
- /* MODAL PLUGIN DEFINITION
-  * ======================= */
+  Modal.prototype.resetScrollbar = function () {
+    this.$body.css('padding-right', '')
+  }
+
+  Modal.prototype.measureScrollbar = function () { // thx walsh
+    var scrollDiv = document.createElement('div')
+    scrollDiv.className = 'modal-scrollbar-measure'
+    this.$body.append(scrollDiv)
+    var scrollbarWidth = scrollDiv.offsetWidth - scrollDiv.clientWidth
+    this.$body[0].removeChild(scrollDiv)
+    return scrollbarWidth
+  }
 
-  var old = $.fn.modal
 
-  $.fn.modal = function (option) {
+  // MODAL PLUGIN DEFINITION
+  // =======================
+
+  function Plugin(option, _relatedTarget) {
     return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('modal')
-        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
-      if (!data) $this.data('modal', (data = new Modal(this, options)))
-      if (typeof option == 'string') data[option]()
-      else if (options.show) data.show()
+      var $this   = $(this)
+      var data    = $this.data('bs.modal')
+      var options = $.extend({}, Modal.DEFAULTS, $this.data(), typeof option == 'object' && option)
+
+      if (!data) $this.data('bs.modal', (data = new Modal(this, options)))
+      if (typeof option == 'string') data[option](_relatedTarget)
+      else if (options.show) data.show(_relatedTarget)
     })
   }
 
-  $.fn.modal.defaults = {
-      backdrop: true
-    , keyboard: true
-    , show: true
-  }
+  var old = $.fn.modal
 
+  $.fn.modal             = Plugin
   $.fn.modal.Constructor = Modal
 
 
- /* MODAL NO CONFLICT
-  * ================= */
+  // MODAL NO CONFLICT
+  // =================
 
   $.fn.modal.noConflict = function () {
     $.fn.modal = old
@@ -226,22 +257,24 @@
   }
 
 
- /* MODAL DATA-API
-  * ============== */
+  // MODAL DATA-API
+  // ==============
 
-  $(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
-    var $this = $(this)
-      , href = $this.attr('href')
-      , $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
-      , option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
+  $(document).on('click.bs.modal.data-api', '[data-toggle="modal"]', function (e) {
+    var $this   = $(this)
+    var href    = $this.attr('href')
+    var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) // strip for ie7
+    var option  = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
 
-    e.preventDefault()
+    if ($this.is('a')) e.preventDefault()
 
-    $target
-      .modal(option)
-      .one('hide', function () {
-        $this.focus()
+    $target.one('show.bs.modal', function (showEvent) {
+      if (showEvent.isDefaultPrevented()) return // only register focus restorer if modal will actually get shown
+      $target.one('hidden.bs.modal', function () {
+        $this.is(':visible') && $this.trigger('focus')
       })
+    })
+    Plugin.call($target, option, this)
   })
 
-}(window.jQuery);
+}(jQuery);
diff --git a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-popover.js b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-popover.js
old mode 100755
new mode 100644
index d461b90b83..825e1b3908
--- a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-popover.js
+++ b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-popover.js
@@ -1,114 +1,113 @@
-/* ===========================================================
- * bootstrap-popover.js v2.3.2
- * http://getbootstrap.com/2.3.2/javascript.html#popovers
- * ===========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * =========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* POPOVER PUBLIC CLASS DEFINITION
-  * =============================== */
+/* ========================================================================
+ * Bootstrap: popover.js v3.2.0
+ * http://getbootstrap.com/javascript/#popovers
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // POPOVER PUBLIC CLASS DEFINITION
+  // ===============================
 
   var Popover = function (element, options) {
     this.init('popover', element, options)
   }
 
+  if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
 
-  /* NOTE: POPOVER EXTENDS BOOTSTRAP-TOOLTIP.js
-     ========================================== */
+  Popover.VERSION  = '3.2.0'
 
-  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype, {
+  Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
+    placement: 'right',
+    trigger: 'click',
+    content: '',
+    template: '<div class="popover" role="tooltip"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
+  })
 
-    constructor: Popover
 
-  , setContent: function () {
-      var $tip = this.tip()
-        , title = this.getTitle()
-        , content = this.getContent()
+  // NOTE: POPOVER EXTENDS tooltip.js
+  // ================================
 
-      $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
-      $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
+  Popover.prototype = $.extend({}, $.fn.tooltip.Constructor.prototype)
 
-      $tip.removeClass('fade top bottom left right in')
-    }
+  Popover.prototype.constructor = Popover
 
-  , hasContent: function () {
-      return this.getTitle() || this.getContent()
-    }
+  Popover.prototype.getDefaults = function () {
+    return Popover.DEFAULTS
+  }
 
-  , getContent: function () {
-      var content
-        , $e = this.$element
-        , o = this.options
+  Popover.prototype.setContent = function () {
+    var $tip    = this.tip()
+    var title   = this.getTitle()
+    var content = this.getContent()
 
-      content = (typeof o.content == 'function' ? o.content.call($e[0]) :  o.content)
-        || $e.attr('data-content')
+    $tip.find('.popover-title')[this.options.html ? 'html' : 'text'](title)
+    $tip.find('.popover-content').empty()[ // we use append for html objects to maintain js events
+      this.options.html ? (typeof content == 'string' ? 'html' : 'append') : 'text'
+    ](content)
 
-      return content
-    }
+    $tip.removeClass('fade top bottom left right in')
 
-  , tip: function () {
-      if (!this.$tip) {
-        this.$tip = $(this.options.template)
-      }
-      return this.$tip
-    }
+    // IE8 doesn't accept hiding via the `:empty` pseudo selector, we have to do
+    // this manually by checking the contents.
+    if (!$tip.find('.popover-title').html()) $tip.find('.popover-title').hide()
+  }
 
-  , destroy: function () {
-      this.hide().$element.off('.' + this.type).removeData(this.type)
-    }
+  Popover.prototype.hasContent = function () {
+    return this.getTitle() || this.getContent()
+  }
 
-  })
+  Popover.prototype.getContent = function () {
+    var $e = this.$element
+    var o  = this.options
 
+    return $e.attr('data-content')
+      || (typeof o.content == 'function' ?
+            o.content.call($e[0]) :
+            o.content)
+  }
 
- /* POPOVER PLUGIN DEFINITION
-  * ======================= */
+  Popover.prototype.arrow = function () {
+    return (this.$arrow = this.$arrow || this.tip().find('.arrow'))
+  }
+
+  Popover.prototype.tip = function () {
+    if (!this.$tip) this.$tip = $(this.options.template)
+    return this.$tip
+  }
 
-  var old = $.fn.popover
 
-  $.fn.popover = function (option) {
+  // POPOVER PLUGIN DEFINITION
+  // =========================
+
+  function Plugin(option) {
     return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('popover')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('popover', (data = new Popover(this, options)))
+      var $this   = $(this)
+      var data    = $this.data('bs.popover')
+      var options = typeof option == 'object' && option
+
+      if (!data && option == 'destroy') return
+      if (!data) $this.data('bs.popover', (data = new Popover(this, options)))
       if (typeof option == 'string') data[option]()
     })
   }
 
-  $.fn.popover.Constructor = Popover
+  var old = $.fn.popover
 
-  $.fn.popover.defaults = $.extend({} , $.fn.tooltip.defaults, {
-    placement: 'right'
-  , trigger: 'click'
-  , content: ''
-  , template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
-  })
+  $.fn.popover             = Plugin
+  $.fn.popover.Constructor = Popover
 
 
- /* POPOVER NO CONFLICT
-  * =================== */
+  // POPOVER NO CONFLICT
+  // ===================
 
   $.fn.popover.noConflict = function () {
     $.fn.popover = old
     return this
   }
 
-}(window.jQuery);
+}(jQuery);
diff --git a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-scrollspy.js b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-scrollspy.js
old mode 100755
new mode 100644
index 32a14ffe25..db2378787e
--- a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-scrollspy.js
+++ b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-scrollspy.js
@@ -1,147 +1,155 @@
-/* =============================================================
- * bootstrap-scrollspy.js v2.3.2
- * http://getbootstrap.com/2.3.2/javascript.html#scrollspy
- * =============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* SCROLLSPY CLASS DEFINITION
-  * ========================== */
+/* ========================================================================
+ * Bootstrap: scrollspy.js v3.2.0
+ * http://getbootstrap.com/javascript/#scrollspy
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // SCROLLSPY CLASS DEFINITION
+  // ==========================
 
   function ScrollSpy(element, options) {
-    var process = $.proxy(this.process, this)
-      , $element = $(element).is('body') ? $(window) : $(element)
-      , href
-    this.options = $.extend({}, $.fn.scrollspy.defaults, options)
-    this.$scrollElement = $element.on('scroll.scroll-spy.data-api', process)
-    this.selector = (this.options.target
-      || ((href = $(element).attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
-      || '') + ' .nav li > a'
-    this.$body = $('body')
+    var process  = $.proxy(this.process, this)
+
+    this.$body          = $('body')
+    this.$scrollElement = $(element).is('body') ? $(window) : $(element)
+    this.options        = $.extend({}, ScrollSpy.DEFAULTS, options)
+    this.selector       = (this.options.target || '') + ' .nav li > a'
+    this.offsets        = []
+    this.targets        = []
+    this.activeTarget   = null
+    this.scrollHeight   = 0
+
+    this.$scrollElement.on('scroll.bs.scrollspy', process)
     this.refresh()
     this.process()
   }
 
-  ScrollSpy.prototype = {
-
-      constructor: ScrollSpy
-
-    , refresh: function () {
-        var self = this
-          , $targets
-
-        this.offsets = $([])
-        this.targets = $([])
-
-        $targets = this.$body
-          .find(this.selector)
-          .map(function () {
-            var $el = $(this)
-              , href = $el.data('target') || $el.attr('href')
-              , $href = /^#\w/.test(href) && $(href)
-            return ( $href
-              && $href.length
-              && [[ $href.position().top + (!$.isWindow(self.$scrollElement.get(0)) && self.$scrollElement.scrollTop()), href ]] ) || null
-          })
-          .sort(function (a, b) { return a[0] - b[0] })
-          .each(function () {
-            self.offsets.push(this[0])
-            self.targets.push(this[1])
-          })
-      }
-
-    , process: function () {
-        var scrollTop = this.$scrollElement.scrollTop() + this.options.offset
-          , scrollHeight = this.$scrollElement[0].scrollHeight || this.$body[0].scrollHeight
-          , maxScroll = scrollHeight - this.$scrollElement.height()
-          , offsets = this.offsets
-          , targets = this.targets
-          , activeTarget = this.activeTarget
-          , i
-
-        if (scrollTop >= maxScroll) {
-          return activeTarget != (i = targets.last()[0])
-            && this.activate ( i )
-        }
-
-        for (i = offsets.length; i--;) {
-          activeTarget != targets[i]
-            && scrollTop >= offsets[i]
-            && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
-            && this.activate( targets[i] )
-        }
-      }
-
-    , activate: function (target) {
-        var active
-          , selector
-
-        this.activeTarget = target
-
-        $(this.selector)
-          .parent('.active')
-          .removeClass('active')
-
-        selector = this.selector
-          + '[data-target="' + target + '"],'
-          + this.selector + '[href="' + target + '"]'
-
-        active = $(selector)
-          .parent('li')
-          .addClass('active')
-
-        if (active.parent('.dropdown-menu').length)  {
-          active = active.closest('li.dropdown').addClass('active')
-        }
-
-        active.trigger('activate')
-      }
+  ScrollSpy.VERSION  = '3.2.0'
+
+  ScrollSpy.DEFAULTS = {
+    offset: 10
+  }
+
+  ScrollSpy.prototype.getScrollHeight = function () {
+    return this.$scrollElement[0].scrollHeight || Math.max(this.$body[0].scrollHeight, document.documentElement.scrollHeight)
+  }
+
+  ScrollSpy.prototype.refresh = function () {
+    var offsetMethod = 'offset'
+    var offsetBase   = 0
+
+    if (!$.isWindow(this.$scrollElement[0])) {
+      offsetMethod = 'position'
+      offsetBase   = this.$scrollElement.scrollTop()
+    }
+
+    this.offsets = []
+    this.targets = []
+    this.scrollHeight = this.getScrollHeight()
+
+    var self     = this
+
+    this.$body
+      .find(this.selector)
+      .map(function () {
+        var $el   = $(this)
+        var href  = $el.data('target') || $el.attr('href')
+        var $href = /^#./.test(href) && $(href)
+
+        return ($href
+          && $href.length
+          && $href.is(':visible')
+          && [[$href[offsetMethod]().top + offsetBase, href]]) || null
+      })
+      .sort(function (a, b) { return a[0] - b[0] })
+      .each(function () {
+        self.offsets.push(this[0])
+        self.targets.push(this[1])
+      })
+  }
 
+  ScrollSpy.prototype.process = function () {
+    var scrollTop    = this.$scrollElement.scrollTop() + this.options.offset
+    var scrollHeight = this.getScrollHeight()
+    var maxScroll    = this.options.offset + scrollHeight - this.$scrollElement.height()
+    var offsets      = this.offsets
+    var targets      = this.targets
+    var activeTarget = this.activeTarget
+    var i
+
+    if (this.scrollHeight != scrollHeight) {
+      this.refresh()
+    }
+
+    if (scrollTop >= maxScroll) {
+      return activeTarget != (i = targets[targets.length - 1]) && this.activate(i)
+    }
+
+    if (activeTarget && scrollTop <= offsets[0]) {
+      return activeTarget != (i = targets[0]) && this.activate(i)
+    }
+
+    for (i = offsets.length; i--;) {
+      activeTarget != targets[i]
+        && scrollTop >= offsets[i]
+        && (!offsets[i + 1] || scrollTop <= offsets[i + 1])
+        && this.activate(targets[i])
+    }
   }
 
+  ScrollSpy.prototype.activate = function (target) {
+    this.activeTarget = target
 
- /* SCROLLSPY PLUGIN DEFINITION
-  * =========================== */
+    $(this.selector)
+      .parentsUntil(this.options.target, '.active')
+      .removeClass('active')
 
-  var old = $.fn.scrollspy
+    var selector = this.selector +
+        '[data-target="' + target + '"],' +
+        this.selector + '[href="' + target + '"]'
+
+    var active = $(selector)
+      .parents('li')
+      .addClass('active')
 
-  $.fn.scrollspy = function (option) {
+    if (active.parent('.dropdown-menu').length) {
+      active = active
+        .closest('li.dropdown')
+        .addClass('active')
+    }
+
+    active.trigger('activate.bs.scrollspy')
+  }
+
+
+  // SCROLLSPY PLUGIN DEFINITION
+  // ===========================
+
+  function Plugin(option) {
     return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('scrollspy')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('scrollspy', (data = new ScrollSpy(this, options)))
+      var $this   = $(this)
+      var data    = $this.data('bs.scrollspy')
+      var options = typeof option == 'object' && option
+
+      if (!data) $this.data('bs.scrollspy', (data = new ScrollSpy(this, options)))
       if (typeof option == 'string') data[option]()
     })
   }
 
-  $.fn.scrollspy.Constructor = ScrollSpy
+  var old = $.fn.scrollspy
 
-  $.fn.scrollspy.defaults = {
-    offset: 10
-  }
+  $.fn.scrollspy             = Plugin
+  $.fn.scrollspy.Constructor = ScrollSpy
 
 
- /* SCROLLSPY NO CONFLICT
-  * ===================== */
+  // SCROLLSPY NO CONFLICT
+  // =====================
 
   $.fn.scrollspy.noConflict = function () {
     $.fn.scrollspy = old
@@ -149,14 +157,14 @@
   }
 
 
- /* SCROLLSPY DATA-API
-  * ================== */
+  // SCROLLSPY DATA-API
+  // ==================
 
-  $(window).on('load', function () {
+  $(window).on('load.bs.scrollspy.data-api', function () {
     $('[data-spy="scroll"]').each(function () {
       var $spy = $(this)
-      $spy.scrollspy($spy.data())
+      Plugin.call($spy, $spy.data())
     })
   })
 
-}(window.jQuery);
+}(jQuery);
diff --git a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-tab.js b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-tab.js
old mode 100755
new mode 100644
index da63756126..c0e1e466cd
--- a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-tab.js
+++ b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-tab.js
@@ -1,131 +1,115 @@
-/* ========================================================
- * bootstrap-tab.js v2.3.2
- * http://getbootstrap.com/2.3.2/javascript.html#tabs
- * ========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ======================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
- /* TAB CLASS DEFINITION
-  * ==================== */
+/* ========================================================================
+ * Bootstrap: tab.js v3.2.0
+ * http://getbootstrap.com/javascript/#tabs
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // TAB CLASS DEFINITION
+  // ====================
 
   var Tab = function (element) {
     this.element = $(element)
   }
 
-  Tab.prototype = {
-
-    constructor: Tab
+  Tab.VERSION = '3.2.0'
 
-  , show: function () {
-      var $this = this.element
-        , $ul = $this.closest('ul:not(.dropdown-menu)')
-        , selector = $this.attr('data-target')
-        , previous
-        , $target
-        , e
+  Tab.prototype.show = function () {
+    var $this    = this.element
+    var $ul      = $this.closest('ul:not(.dropdown-menu)')
+    var selector = $this.data('target')
 
-      if (!selector) {
-        selector = $this.attr('href')
-        selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
-      }
-
-      if ( $this.parent('li').hasClass('active') ) return
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') // strip for ie7
+    }
 
-      previous = $ul.find('.active:last a')[0]
+    if ($this.parent('li').hasClass('active')) return
 
-      e = $.Event('show', {
-        relatedTarget: previous
-      })
+    var previous = $ul.find('.active:last a')[0]
+    var e        = $.Event('show.bs.tab', {
+      relatedTarget: previous
+    })
 
-      $this.trigger(e)
+    $this.trigger(e)
 
-      if (e.isDefaultPrevented()) return
+    if (e.isDefaultPrevented()) return
 
-      $target = $(selector)
+    var $target = $(selector)
 
-      this.activate($this.parent('li'), $ul)
-      this.activate($target, $target.parent(), function () {
-        $this.trigger({
-          type: 'shown'
-        , relatedTarget: previous
-        })
+    this.activate($this.closest('li'), $ul)
+    this.activate($target, $target.parent(), function () {
+      $this.trigger({
+        type: 'shown.bs.tab',
+        relatedTarget: previous
       })
-    }
-
-  , activate: function ( element, container, callback) {
-      var $active = container.find('> .active')
-        , transition = callback
-            && $.support.transition
-            && $active.hasClass('fade')
-
-      function next() {
-        $active
-          .removeClass('active')
-          .find('> .dropdown-menu > .active')
-          .removeClass('active')
-
-        element.addClass('active')
-
-        if (transition) {
-          element[0].offsetWidth // reflow for transition
-          element.addClass('in')
-        } else {
-          element.removeClass('fade')
-        }
-
-        if ( element.parent('.dropdown-menu') ) {
-          element.closest('li.dropdown').addClass('active')
-        }
+    })
+  }
 
-        callback && callback()
+  Tab.prototype.activate = function (element, container, callback) {
+    var $active    = container.find('> .active')
+    var transition = callback
+      && $.support.transition
+      && $active.hasClass('fade')
+
+    function next() {
+      $active
+        .removeClass('active')
+        .find('> .dropdown-menu > .active')
+        .removeClass('active')
+
+      element.addClass('active')
+
+      if (transition) {
+        element[0].offsetWidth // reflow for transition
+        element.addClass('in')
+      } else {
+        element.removeClass('fade')
       }
 
-      transition ?
-        $active.one($.support.transition.end, next) :
-        next()
+      if (element.parent('.dropdown-menu')) {
+        element.closest('li.dropdown').addClass('active')
+      }
 
-      $active.removeClass('in')
+      callback && callback()
     }
-  }
 
+    transition ?
+      $active
+        .one('bsTransitionEnd', next)
+        .emulateTransitionEnd(150) :
+      next()
 
- /* TAB PLUGIN DEFINITION
-  * ===================== */
+    $active.removeClass('in')
+  }
 
-  var old = $.fn.tab
 
-  $.fn.tab = function ( option ) {
+  // TAB PLUGIN DEFINITION
+  // =====================
+
+  function Plugin(option) {
     return this.each(function () {
       var $this = $(this)
-        , data = $this.data('tab')
-      if (!data) $this.data('tab', (data = new Tab(this)))
+      var data  = $this.data('bs.tab')
+
+      if (!data) $this.data('bs.tab', (data = new Tab(this)))
       if (typeof option == 'string') data[option]()
     })
   }
 
+  var old = $.fn.tab
+
+  $.fn.tab             = Plugin
   $.fn.tab.Constructor = Tab
 
 
- /* TAB NO CONFLICT
-  * =============== */
+  // TAB NO CONFLICT
+  // ===============
 
   $.fn.tab.noConflict = function () {
     $.fn.tab = old
@@ -133,12 +117,12 @@
   }
 
 
- /* TAB DATA-API
-  * ============ */
+  // TAB DATA-API
+  // ============
 
-  $(document).on('click.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
+  $(document).on('click.bs.tab.data-api', '[data-toggle="tab"], [data-toggle="pill"]', function (e) {
     e.preventDefault()
-    $(this).tab('show')
+    Plugin.call($(this), 'show')
   })
 
-}(window.jQuery);
+}(jQuery);
diff --git a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-tooltip.js b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-tooltip.js
old mode 100755
new mode 100644
index 92108fd0a8..9cdb6c9e4d
--- a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-tooltip.js
+++ b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-tooltip.js
@@ -1,361 +1,457 @@
-/* ===========================================================
- * bootstrap-tooltip.js v2.3.2
- * http://getbootstrap.com/2.3.2/javascript.html#tooltips
+/* ========================================================================
+ * Bootstrap: tooltip.js v3.2.0
+ * http://getbootstrap.com/javascript/#tooltip
  * Inspired by the original jQuery.tipsy by Jason Frame
- * ===========================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
 
 
-!function ($) {
++function ($) {
+  'use strict';
 
-  "use strict"; // jshint ;_;
-
-
- /* TOOLTIP PUBLIC CLASS DEFINITION
-  * =============================== */
+  // TOOLTIP PUBLIC CLASS DEFINITION
+  // ===============================
 
   var Tooltip = function (element, options) {
+    this.type       =
+    this.options    =
+    this.enabled    =
+    this.timeout    =
+    this.hoverState =
+    this.$element   = null
+
     this.init('tooltip', element, options)
   }
 
-  Tooltip.prototype = {
-
-    constructor: Tooltip
-
-  , init: function (type, element, options) {
-      var eventIn
-        , eventOut
-        , triggers
-        , trigger
-        , i
-
-      this.type = type
-      this.$element = $(element)
-      this.options = this.getOptions(options)
-      this.enabled = true
-
-      triggers = this.options.trigger.split(' ')
-
-      for (i = triggers.length; i--;) {
-        trigger = triggers[i]
-        if (trigger == 'click') {
-          this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
-        } else if (trigger != 'manual') {
-          eventIn = trigger == 'hover' ? 'mouseenter' : 'focus'
-          eventOut = trigger == 'hover' ? 'mouseleave' : 'blur'
-          this.$element.on(eventIn + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
-          this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
-        }
-      }
-
-      this.options.selector ?
-        (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
-        this.fixTitle()
+  Tooltip.VERSION  = '3.2.0'
+
+  Tooltip.DEFAULTS = {
+    animation: true,
+    placement: 'top',
+    selector: false,
+    template: '<div class="tooltip" role="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',
+    trigger: 'hover focus',
+    title: '',
+    delay: 0,
+    html: false,
+    container: false,
+    viewport: {
+      selector: 'body',
+      padding: 0
     }
+  }
+
+  Tooltip.prototype.init = function (type, element, options) {
+    this.enabled   = true
+    this.type      = type
+    this.$element  = $(element)
+    this.options   = this.getOptions(options)
+    this.$viewport = this.options.viewport && $(this.options.viewport.selector || this.options.viewport)
 
-  , getOptions: function (options) {
-      options = $.extend({}, $.fn[this.type].defaults, this.$element.data(), options)
+    var triggers = this.options.trigger.split(' ')
 
-      if (options.delay && typeof options.delay == 'number') {
-        options.delay = {
-          show: options.delay
-        , hide: options.delay
-        }
+    for (var i = triggers.length; i--;) {
+      var trigger = triggers[i]
+
+      if (trigger == 'click') {
+        this.$element.on('click.' + this.type, this.options.selector, $.proxy(this.toggle, this))
+      } else if (trigger != 'manual') {
+        var eventIn  = trigger == 'hover' ? 'mouseenter' : 'focusin'
+        var eventOut = trigger == 'hover' ? 'mouseleave' : 'focusout'
+
+        this.$element.on(eventIn  + '.' + this.type, this.options.selector, $.proxy(this.enter, this))
+        this.$element.on(eventOut + '.' + this.type, this.options.selector, $.proxy(this.leave, this))
       }
+    }
+
+    this.options.selector ?
+      (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
+      this.fixTitle()
+  }
+
+  Tooltip.prototype.getDefaults = function () {
+    return Tooltip.DEFAULTS
+  }
 
-      return options
+  Tooltip.prototype.getOptions = function (options) {
+    options = $.extend({}, this.getDefaults(), this.$element.data(), options)
+
+    if (options.delay && typeof options.delay == 'number') {
+      options.delay = {
+        show: options.delay,
+        hide: options.delay
+      }
     }
 
-  , enter: function (e) {
-      var defaults = $.fn[this.type].defaults
-        , options = {}
-        , self
+    return options
+  }
 
-      this._options && $.each(this._options, function (key, value) {
-        if (defaults[key] != value) options[key] = value
-      }, this)
+  Tooltip.prototype.getDelegateOptions = function () {
+    var options  = {}
+    var defaults = this.getDefaults()
 
-      self = $(e.currentTarget)[this.type](options).data(this.type)
+    this._options && $.each(this._options, function (key, value) {
+      if (defaults[key] != value) options[key] = value
+    })
 
-      if (!self.options.delay || !self.options.delay.show) return self.show()
+    return options
+  }
+
+  Tooltip.prototype.enter = function (obj) {
+    var self = obj instanceof this.constructor ?
+      obj : $(obj.currentTarget).data('bs.' + this.type)
 
-      clearTimeout(this.timeout)
-      self.hoverState = 'in'
-      this.timeout = setTimeout(function() {
-        if (self.hoverState == 'in') self.show()
-      }, self.options.delay.show)
+    if (!self) {
+      self = new this.constructor(obj.currentTarget, this.getDelegateOptions())
+      $(obj.currentTarget).data('bs.' + this.type, self)
     }
 
-  , leave: function (e) {
-      var self = $(e.currentTarget)[this.type](this._options).data(this.type)
+    clearTimeout(self.timeout)
 
-      if (this.timeout) clearTimeout(this.timeout)
-      if (!self.options.delay || !self.options.delay.hide) return self.hide()
+    self.hoverState = 'in'
 
-      self.hoverState = 'out'
-      this.timeout = setTimeout(function() {
-        if (self.hoverState == 'out') self.hide()
-      }, self.options.delay.hide)
-    }
+    if (!self.options.delay || !self.options.delay.show) return self.show()
 
-  , show: function () {
-      var $tip
-        , pos
-        , actualWidth
-        , actualHeight
-        , placement
-        , tp
-        , e = $.Event('show')
-
-      if (this.hasContent() && this.enabled) {
-        this.$element.trigger(e)
-        if (e.isDefaultPrevented()) return
-        $tip = this.tip()
-        this.setContent()
-
-        if (this.options.animation) {
-          $tip.addClass('fade')
-        }
-
-        placement = typeof this.options.placement == 'function' ?
-          this.options.placement.call(this, $tip[0], this.$element[0]) :
-          this.options.placement
+    self.timeout = setTimeout(function () {
+      if (self.hoverState == 'in') self.show()
+    }, self.options.delay.show)
+  }
 
-        $tip
-          .detach()
-          .css({ top: 0, left: 0, display: 'block' })
-
-        this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
-
-        pos = this.getPosition()
-
-        actualWidth = $tip[0].offsetWidth
-        actualHeight = $tip[0].offsetHeight
-
-        switch (placement) {
-          case 'bottom':
-            tp = {top: pos.top + pos.height, left: pos.left + pos.width / 2 - actualWidth / 2}
-            break
-          case 'top':
-            tp = {top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2}
-            break
-          case 'left':
-            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth}
-            break
-          case 'right':
-            tp = {top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width}
-            break
-        }
-
-        this.applyPlacement(tp, placement)
-        this.$element.trigger('shown')
-      }
+  Tooltip.prototype.leave = function (obj) {
+    var self = obj instanceof this.constructor ?
+      obj : $(obj.currentTarget).data('bs.' + this.type)
+
+    if (!self) {
+      self = new this.constructor(obj.currentTarget, this.getDelegateOptions())
+      $(obj.currentTarget).data('bs.' + this.type, self)
     }
 
-  , applyPlacement: function(offset, placement){
+    clearTimeout(self.timeout)
+
+    self.hoverState = 'out'
+
+    if (!self.options.delay || !self.options.delay.hide) return self.hide()
+
+    self.timeout = setTimeout(function () {
+      if (self.hoverState == 'out') self.hide()
+    }, self.options.delay.hide)
+  }
+
+  Tooltip.prototype.show = function () {
+    var e = $.Event('show.bs.' + this.type)
+
+    if (this.hasContent() && this.enabled) {
+      this.$element.trigger(e)
+
+      var inDom = $.contains(document.documentElement, this.$element[0])
+      if (e.isDefaultPrevented() || !inDom) return
+      var that = this
+
       var $tip = this.tip()
-        , width = $tip[0].offsetWidth
-        , height = $tip[0].offsetHeight
-        , actualWidth
-        , actualHeight
-        , delta
-        , replace
+
+      var tipId = this.getUID(this.type)
+
+      this.setContent()
+      $tip.attr('id', tipId)
+      this.$element.attr('aria-describedby', tipId)
+
+      if (this.options.animation) $tip.addClass('fade')
+
+      var placement = typeof this.options.placement == 'function' ?
+        this.options.placement.call(this, $tip[0], this.$element[0]) :
+        this.options.placement
+
+      var autoToken = /\s?auto?\s?/i
+      var autoPlace = autoToken.test(placement)
+      if (autoPlace) placement = placement.replace(autoToken, '') || 'top'
 
       $tip
-        .offset(offset)
+        .detach()
+        .css({ top: 0, left: 0, display: 'block' })
         .addClass(placement)
-        .addClass('in')
+        .data('bs.' + this.type, this)
+
+      this.options.container ? $tip.appendTo(this.options.container) : $tip.insertAfter(this.$element)
 
-      actualWidth = $tip[0].offsetWidth
-      actualHeight = $tip[0].offsetHeight
+      var pos          = this.getPosition()
+      var actualWidth  = $tip[0].offsetWidth
+      var actualHeight = $tip[0].offsetHeight
 
-      if (placement == 'top' && actualHeight != height) {
-        offset.top = offset.top + height - actualHeight
-        replace = true
+      if (autoPlace) {
+        var orgPlacement = placement
+        var $parent      = this.$element.parent()
+        var parentDim    = this.getPosition($parent)
+
+        placement = placement == 'bottom' && pos.top   + pos.height       + actualHeight - parentDim.scroll > parentDim.height ? 'top'    :
+                    placement == 'top'    && pos.top   - parentDim.scroll - actualHeight < 0                                   ? 'bottom' :
+                    placement == 'right'  && pos.right + actualWidth      > parentDim.width                                    ? 'left'   :
+                    placement == 'left'   && pos.left  - actualWidth      < parentDim.left                                     ? 'right'  :
+                    placement
+
+        $tip
+          .removeClass(orgPlacement)
+          .addClass(placement)
       }
 
-      if (placement == 'bottom' || placement == 'top') {
-        delta = 0
+      var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
 
-        if (offset.left < 0){
-          delta = offset.left * -2
-          offset.left = 0
-          $tip.offset(offset)
-          actualWidth = $tip[0].offsetWidth
-          actualHeight = $tip[0].offsetHeight
-        }
+      this.applyPlacement(calculatedOffset, placement)
 
-        this.replaceArrow(delta - width + actualWidth, actualWidth, 'left')
-      } else {
-        this.replaceArrow(actualHeight - height, actualHeight, 'top')
+      var complete = function () {
+        that.$element.trigger('shown.bs.' + that.type)
+        that.hoverState = null
       }
 
-      if (replace) $tip.offset(offset)
+      $.support.transition && this.$tip.hasClass('fade') ?
+        $tip
+          .one('bsTransitionEnd', complete)
+          .emulateTransitionEnd(150) :
+        complete()
     }
+  }
 
-  , replaceArrow: function(delta, dimension, position){
-      this
-        .arrow()
-        .css(position, delta ? (50 * (1 - delta / dimension) + "%") : '')
-    }
+  Tooltip.prototype.applyPlacement = function (offset, placement) {
+    var $tip   = this.tip()
+    var width  = $tip[0].offsetWidth
+    var height = $tip[0].offsetHeight
+
+    // manually read margins because getBoundingClientRect includes difference
+    var marginTop = parseInt($tip.css('margin-top'), 10)
+    var marginLeft = parseInt($tip.css('margin-left'), 10)
+
+    // we must check for NaN for ie 8/9
+    if (isNaN(marginTop))  marginTop  = 0
+    if (isNaN(marginLeft)) marginLeft = 0
+
+    offset.top  = offset.top  + marginTop
+    offset.left = offset.left + marginLeft
+
+    // $.fn.offset doesn't round pixel values
+    // so we use setOffset directly with our own function B-0
+    $.offset.setOffset($tip[0], $.extend({
+      using: function (props) {
+        $tip.css({
+          top: Math.round(props.top),
+          left: Math.round(props.left)
+        })
+      }
+    }, offset), 0)
 
-  , setContent: function () {
-      var $tip = this.tip()
-        , title = this.getTitle()
+    $tip.addClass('in')
 
-      $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
-      $tip.removeClass('fade in top bottom left right')
+    // check to see if placing tip in new offset caused the tip to resize itself
+    var actualWidth  = $tip[0].offsetWidth
+    var actualHeight = $tip[0].offsetHeight
+
+    if (placement == 'top' && actualHeight != height) {
+      offset.top = offset.top + height - actualHeight
     }
 
-  , hide: function () {
-      var that = this
-        , $tip = this.tip()
-        , e = $.Event('hide')
+    var delta = this.getViewportAdjustedDelta(placement, offset, actualWidth, actualHeight)
 
-      this.$element.trigger(e)
-      if (e.isDefaultPrevented()) return
+    if (delta.left) offset.left += delta.left
+    else offset.top += delta.top
 
-      $tip.removeClass('in')
+    var arrowDelta          = delta.left ? delta.left * 2 - width + actualWidth : delta.top * 2 - height + actualHeight
+    var arrowPosition       = delta.left ? 'left'        : 'top'
+    var arrowOffsetPosition = delta.left ? 'offsetWidth' : 'offsetHeight'
 
-      function removeWithAnimation() {
-        var timeout = setTimeout(function () {
-          $tip.off($.support.transition.end).detach()
-        }, 500)
+    $tip.offset(offset)
+    this.replaceArrow(arrowDelta, $tip[0][arrowOffsetPosition], arrowPosition)
+  }
 
-        $tip.one($.support.transition.end, function () {
-          clearTimeout(timeout)
-          $tip.detach()
-        })
-      }
+  Tooltip.prototype.replaceArrow = function (delta, dimension, position) {
+    this.arrow().css(position, delta ? (50 * (1 - delta / dimension) + '%') : '')
+  }
 
-      $.support.transition && this.$tip.hasClass('fade') ?
-        removeWithAnimation() :
-        $tip.detach()
+  Tooltip.prototype.setContent = function () {
+    var $tip  = this.tip()
+    var title = this.getTitle()
 
-      this.$element.trigger('hidden')
+    $tip.find('.tooltip-inner')[this.options.html ? 'html' : 'text'](title)
+    $tip.removeClass('fade in top bottom left right')
+  }
 
-      return this
-    }
+  Tooltip.prototype.hide = function () {
+    var that = this
+    var $tip = this.tip()
+    var e    = $.Event('hide.bs.' + this.type)
 
-  , fixTitle: function () {
-      var $e = this.$element
-      if ($e.attr('title') || typeof($e.attr('data-original-title')) != 'string') {
-        $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
-      }
-    }
+    this.$element.removeAttr('aria-describedby')
 
-  , hasContent: function () {
-      return this.getTitle()
+    function complete() {
+      if (that.hoverState != 'in') $tip.detach()
+      that.$element.trigger('hidden.bs.' + that.type)
     }
 
-  , getPosition: function () {
-      var el = this.$element[0]
-      return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
-        width: el.offsetWidth
-      , height: el.offsetHeight
-      }, this.$element.offset())
-    }
+    this.$element.trigger(e)
 
-  , getTitle: function () {
-      var title
-        , $e = this.$element
-        , o = this.options
+    if (e.isDefaultPrevented()) return
 
-      title = $e.attr('data-original-title')
-        || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+    $tip.removeClass('in')
 
-      return title
-    }
+    $.support.transition && this.$tip.hasClass('fade') ?
+      $tip
+        .one('bsTransitionEnd', complete)
+        .emulateTransitionEnd(150) :
+      complete()
 
-  , tip: function () {
-      return this.$tip = this.$tip || $(this.options.template)
-    }
+    this.hoverState = null
 
-  , arrow: function(){
-      return this.$arrow = this.$arrow || this.tip().find(".tooltip-arrow")
+    return this
+  }
+
+  Tooltip.prototype.fixTitle = function () {
+    var $e = this.$element
+    if ($e.attr('title') || typeof ($e.attr('data-original-title')) != 'string') {
+      $e.attr('data-original-title', $e.attr('title') || '').attr('title', '')
     }
+  }
+
+  Tooltip.prototype.hasContent = function () {
+    return this.getTitle()
+  }
+
+  Tooltip.prototype.getPosition = function ($element) {
+    $element   = $element || this.$element
+    var el     = $element[0]
+    var isBody = el.tagName == 'BODY'
+    return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : null, {
+      scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop(),
+      width:  isBody ? $(window).width()  : $element.outerWidth(),
+      height: isBody ? $(window).height() : $element.outerHeight()
+    }, isBody ? { top: 0, left: 0 } : $element.offset())
+  }
 
-  , validate: function () {
-      if (!this.$element[0].parentNode) {
-        this.hide()
-        this.$element = null
-        this.options = null
+  Tooltip.prototype.getCalculatedOffset = function (placement, pos, actualWidth, actualHeight) {
+    return placement == 'bottom' ? { top: pos.top + pos.height,   left: pos.left + pos.width / 2 - actualWidth / 2  } :
+           placement == 'top'    ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2  } :
+           placement == 'left'   ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
+        /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width   }
+
+  }
+
+  Tooltip.prototype.getViewportAdjustedDelta = function (placement, pos, actualWidth, actualHeight) {
+    var delta = { top: 0, left: 0 }
+    if (!this.$viewport) return delta
+
+    var viewportPadding = this.options.viewport && this.options.viewport.padding || 0
+    var viewportDimensions = this.getPosition(this.$viewport)
+
+    if (/right|left/.test(placement)) {
+      var topEdgeOffset    = pos.top - viewportPadding - viewportDimensions.scroll
+      var bottomEdgeOffset = pos.top + viewportPadding - viewportDimensions.scroll + actualHeight
+      if (topEdgeOffset < viewportDimensions.top) { // top overflow
+        delta.top = viewportDimensions.top - topEdgeOffset
+      } else if (bottomEdgeOffset > viewportDimensions.top + viewportDimensions.height) { // bottom overflow
+        delta.top = viewportDimensions.top + viewportDimensions.height - bottomEdgeOffset
+      }
+    } else {
+      var leftEdgeOffset  = pos.left - viewportPadding
+      var rightEdgeOffset = pos.left + viewportPadding + actualWidth
+      if (leftEdgeOffset < viewportDimensions.left) { // left overflow
+        delta.left = viewportDimensions.left - leftEdgeOffset
+      } else if (rightEdgeOffset > viewportDimensions.width) { // right overflow
+        delta.left = viewportDimensions.left + viewportDimensions.width - rightEdgeOffset
       }
     }
 
-  , enable: function () {
-      this.enabled = true
-    }
+    return delta
+  }
 
-  , disable: function () {
-      this.enabled = false
-    }
+  Tooltip.prototype.getTitle = function () {
+    var title
+    var $e = this.$element
+    var o  = this.options
 
-  , toggleEnabled: function () {
-      this.enabled = !this.enabled
-    }
+    title = $e.attr('data-original-title')
+      || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+
+    return title
+  }
+
+  Tooltip.prototype.getUID = function (prefix) {
+    do prefix += ~~(Math.random() * 1000000)
+    while (document.getElementById(prefix))
+    return prefix
+  }
+
+  Tooltip.prototype.tip = function () {
+    return (this.$tip = this.$tip || $(this.options.template))
+  }
 
-  , toggle: function (e) {
-      var self = e ? $(e.currentTarget)[this.type](this._options).data(this.type) : this
-      self.tip().hasClass('in') ? self.hide() : self.show()
+  Tooltip.prototype.arrow = function () {
+    return (this.$arrow = this.$arrow || this.tip().find('.tooltip-arrow'))
+  }
+
+  Tooltip.prototype.validate = function () {
+    if (!this.$element[0].parentNode) {
+      this.hide()
+      this.$element = null
+      this.options  = null
     }
+  }
 
-  , destroy: function () {
-      this.hide().$element.off('.' + this.type).removeData(this.type)
+  Tooltip.prototype.enable = function () {
+    this.enabled = true
+  }
+
+  Tooltip.prototype.disable = function () {
+    this.enabled = false
+  }
+
+  Tooltip.prototype.toggleEnabled = function () {
+    this.enabled = !this.enabled
+  }
+
+  Tooltip.prototype.toggle = function (e) {
+    var self = this
+    if (e) {
+      self = $(e.currentTarget).data('bs.' + this.type)
+      if (!self) {
+        self = new this.constructor(e.currentTarget, this.getDelegateOptions())
+        $(e.currentTarget).data('bs.' + this.type, self)
+      }
     }
 
+    self.tip().hasClass('in') ? self.leave(self) : self.enter(self)
   }
 
+  Tooltip.prototype.destroy = function () {
+    clearTimeout(this.timeout)
+    this.hide().$element.off('.' + this.type).removeData('bs.' + this.type)
+  }
 
- /* TOOLTIP PLUGIN DEFINITION
-  * ========================= */
 
-  var old = $.fn.tooltip
+  // TOOLTIP PLUGIN DEFINITION
+  // =========================
 
-  $.fn.tooltip = function ( option ) {
+  function Plugin(option) {
     return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('tooltip')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('tooltip', (data = new Tooltip(this, options)))
+      var $this   = $(this)
+      var data    = $this.data('bs.tooltip')
+      var options = typeof option == 'object' && option
+
+      if (!data && option == 'destroy') return
+      if (!data) $this.data('bs.tooltip', (data = new Tooltip(this, options)))
       if (typeof option == 'string') data[option]()
     })
   }
 
-  $.fn.tooltip.Constructor = Tooltip
+  var old = $.fn.tooltip
 
-  $.fn.tooltip.defaults = {
-    animation: true
-  , placement: 'top'
-  , selector: false
-  , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
-  , trigger: 'hover focus'
-  , title: ''
-  , delay: 0
-  , html: false
-  , container: false
-  }
+  $.fn.tooltip             = Plugin
+  $.fn.tooltip.Constructor = Tooltip
 
 
- /* TOOLTIP NO CONFLICT
-  * =================== */
+  // TOOLTIP NO CONFLICT
+  // ===================
 
   $.fn.tooltip.noConflict = function () {
     $.fn.tooltip = old
     return this
   }
 
-}(window.jQuery);
+}(jQuery);
diff --git a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-transition.js b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-transition.js
old mode 100755
new mode 100644
index 9726d47cb2..83f85bf45f
--- a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-transition.js
+++ b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-transition.js
@@ -1,60 +1,59 @@
-/* ===================================================
- * bootstrap-transition.js v2.3.2
- * http://getbootstrap.com/2.3.2/javascript.html#transitions
- * ===================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ========================================================== */
-
-
-!function ($) {
-
-  "use strict"; // jshint ;_;
-
-
-  /* CSS TRANSITION SUPPORT (http://www.modernizr.com/)
-   * ======================================================= */
-
-  $(function () {
-
-    $.support.transition = (function () {
+/* ========================================================================
+ * Bootstrap: transition.js v3.2.0
+ * http://getbootstrap.com/javascript/#transitions
+ * ========================================================================
+ * Copyright 2011-2014 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
+
+
++function ($) {
+  'use strict';
+
+  // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
+  // ============================================================
+
+  function transitionEnd() {
+    var el = document.createElement('bootstrap')
+
+    var transEndEventNames = {
+      WebkitTransition : 'webkitTransitionEnd',
+      MozTransition    : 'transitionend',
+      OTransition      : 'oTransitionEnd otransitionend',
+      transition       : 'transitionend'
+    }
+
+    for (var name in transEndEventNames) {
+      if (el.style[name] !== undefined) {
+        return { end: transEndEventNames[name] }
+      }
+    }
 
-      var transitionEnd = (function () {
+    return false // explicit for ie8 (  ._.)
+  }
 
-        var el = document.createElement('bootstrap')
-          , transEndEventNames = {
-               'WebkitTransition' : 'webkitTransitionEnd'
-            ,  'MozTransition'    : 'transitionend'
-            ,  'OTransition'      : 'oTransitionEnd otransitionend'
-            ,  'transition'       : 'transitionend'
-            }
-          , name
+  // http://blog.alexmaccaw.com/css-transitions
+  $.fn.emulateTransitionEnd = function (duration) {
+    var called = false
+    var $el = this
+    $(this).one('bsTransitionEnd', function () { called = true })
+    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
+    setTimeout(callback, duration)
+    return this
+  }
 
-        for (name in transEndEventNames){
-          if (el.style[name] !== undefined) {
-            return transEndEventNames[name]
-          }
-        }
+  $(function () {
+    $.support.transition = transitionEnd()
 
-      }())
+    if (!$.support.transition) return
 
-      return transitionEnd && {
-        end: transitionEnd
+    $.event.special.bsTransitionEnd = {
+      bindType: $.support.transition.end,
+      delegateType: $.support.transition.end,
+      handle: function (e) {
+        if ($(e.target).is(this)) return e.handleObj.handler.apply(this, arguments)
       }
-
-    })()
-
+    }
   })
 
-}(window.jQuery);
+}(jQuery);
diff --git a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-typeahead.js b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-typeahead.js
old mode 100755
new mode 100644
index 319191caba..8164a3c25e
--- a/app/assets/javascripts/rails_admin/bootstrap/bootstrap-typeahead.js
+++ b/app/assets/javascripts/rails_admin/bootstrap/bootstrap-typeahead.js
@@ -1,335 +1,1782 @@
-/* =============================================================
- * bootstrap-typeahead.js v2.3.2
- * http://getbootstrap.com/2.3.2/javascript.html#typeahead
- * =============================================================
- * Copyright 2012 Twitter, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============================================================ */
-
-
-!function($){
-
-  "use strict"; // jshint ;_;
-
-
- /* TYPEAHEAD PUBLIC CLASS DEFINITION
-  * ================================= */
-
-  var Typeahead = function (element, options) {
-    this.$element = $(element)
-    this.options = $.extend({}, $.fn.typeahead.defaults, options)
-    this.matcher = this.options.matcher || this.matcher
-    this.sorter = this.options.sorter || this.sorter
-    this.highlighter = this.options.highlighter || this.highlighter
-    this.updater = this.options.updater || this.updater
-    this.source = this.options.source
-    this.$menu = $(this.options.menu)
-    this.shown = false
-    this.listen()
-  }
-
-  Typeahead.prototype = {
-
-    constructor: Typeahead
-
-  , select: function () {
-      var val = this.$menu.find('.active').attr('data-value')
-      this.$element
-        .val(this.updater(val))
-        .change()
-      return this.hide()
-    }
-
-  , updater: function (item) {
-      return item
-    }
-
-  , show: function () {
-      var pos = $.extend({}, this.$element.position(), {
-        height: this.$element[0].offsetHeight
-      })
-
-      this.$menu
-        .insertAfter(this.$element)
-        .css({
-          top: pos.top + pos.height
-        , left: pos.left
-        })
-        .show()
-
-      this.shown = true
-      return this
-    }
-
-  , hide: function () {
-      this.$menu.hide()
-      this.shown = false
-      return this
-    }
-
-  , lookup: function (event) {
-      var items
-
-      this.query = this.$element.val()
-
-      if (!this.query || this.query.length < this.options.minLength) {
-        return this.shown ? this.hide() : this
-      }
-
-      items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source
-
-      return items ? this.process(items) : this
-    }
-
-  , process: function (items) {
-      var that = this
-
-      items = $.grep(items, function (item) {
-        return that.matcher(item)
-      })
-
-      items = this.sorter(items)
-
-      if (!items.length) {
-        return this.shown ? this.hide() : this
-      }
-
-      return this.render(items.slice(0, this.options.items)).show()
-    }
-
-  , matcher: function (item) {
-      return ~item.toLowerCase().indexOf(this.query.toLowerCase())
-    }
-
-  , sorter: function (items) {
-      var beginswith = []
-        , caseSensitive = []
-        , caseInsensitive = []
-        , item
-
-      while (item = items.shift()) {
-        if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item)
-        else if (~item.indexOf(this.query)) caseSensitive.push(item)
-        else caseInsensitive.push(item)
-      }
-
-      return beginswith.concat(caseSensitive, caseInsensitive)
-    }
-
-  , highlighter: function (item) {
-      var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&')
-      return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) {
-        return '<strong>' + match + '</strong>'
-      })
-    }
-
-  , render: function (items) {
-      var that = this
-
-      items = $(items).map(function (i, item) {
-        i = $(that.options.item).attr('data-value', item)
-        i.find('a').html(that.highlighter(item))
-        return i[0]
-      })
-
-      items.first().addClass('active')
-      this.$menu.html(items)
-      return this
-    }
-
-  , next: function (event) {
-      var active = this.$menu.find('.active').removeClass('active')
-        , next = active.next()
-
-      if (!next.length) {
-        next = $(this.$menu.find('li')[0])
-      }
-
-      next.addClass('active')
-    }
-
-  , prev: function (event) {
-      var active = this.$menu.find('.active').removeClass('active')
-        , prev = active.prev()
-
-      if (!prev.length) {
-        prev = this.$menu.find('li').last()
-      }
-
-      prev.addClass('active')
-    }
-
-  , listen: function () {
-      this.$element
-        .on('focus',    $.proxy(this.focus, this))
-        .on('blur',     $.proxy(this.blur, this))
-        .on('keypress', $.proxy(this.keypress, this))
-        .on('keyup',    $.proxy(this.keyup, this))
-
-      if (this.eventSupported('keydown')) {
-        this.$element.on('keydown', $.proxy(this.keydown, this))
-      }
-
-      this.$menu
-        .on('click', $.proxy(this.click, this))
-        .on('mouseenter', 'li', $.proxy(this.mouseenter, this))
-        .on('mouseleave', 'li', $.proxy(this.mouseleave, this))
-    }
-
-  , eventSupported: function(eventName) {
-      var isSupported = eventName in this.$element
-      if (!isSupported) {
-        this.$element.setAttribute(eventName, 'return;')
-        isSupported = typeof this.$element[eventName] === 'function'
-      }
-      return isSupported
-    }
-
-  , move: function (e) {
-      if (!this.shown) return
-
-      switch(e.keyCode) {
-        case 9: // tab
-        case 13: // enter
-        case 27: // escape
-          e.preventDefault()
-          break
-
-        case 38: // up arrow
-          e.preventDefault()
-          this.prev()
-          break
-
-        case 40: // down arrow
-          e.preventDefault()
-          this.next()
-          break
-      }
-
-      e.stopPropagation()
-    }
-
-  , keydown: function (e) {
-      this.suppressKeyPressRepeat = ~$.inArray(e.keyCode, [40,38,9,13,27])
-      this.move(e)
-    }
-
-  , keypress: function (e) {
-      if (this.suppressKeyPressRepeat) return
-      this.move(e)
-    }
-
-  , keyup: function (e) {
-      switch(e.keyCode) {
-        case 40: // down arrow
-        case 38: // up arrow
-        case 16: // shift
-        case 17: // ctrl
-        case 18: // alt
-          break
-
-        case 9: // tab
-        case 13: // enter
-          if (!this.shown) return
-          this.select()
-          break
-
-        case 27: // escape
-          if (!this.shown) return
-          this.hide()
-          break
-
-        default:
-          this.lookup()
-      }
-
-      e.stopPropagation()
-      e.preventDefault()
-  }
-
-  , focus: function (e) {
-      this.focused = true
-    }
-
-  , blur: function (e) {
-      this.focused = false
-      if (!this.mousedover && this.shown) this.hide()
-    }
-
-  , click: function (e) {
-      e.stopPropagation()
-      e.preventDefault()
-      this.select()
-      this.$element.focus()
-    }
-
-  , mouseenter: function (e) {
-      this.mousedover = true
-      this.$menu.find('.active').removeClass('active')
-      $(e.currentTarget).addClass('active')
-    }
-
-  , mouseleave: function (e) {
-      this.mousedover = false
-      if (!this.focused && this.shown) this.hide()
-    }
-
-  }
-
-
-  /* TYPEAHEAD PLUGIN DEFINITION
-   * =========================== */
-
-  var old = $.fn.typeahead
-
-  $.fn.typeahead = function (option) {
-    return this.each(function () {
-      var $this = $(this)
-        , data = $this.data('typeahead')
-        , options = typeof option == 'object' && option
-      if (!data) $this.data('typeahead', (data = new Typeahead(this, options)))
-      if (typeof option == 'string') data[option]()
-    })
-  }
-
-  $.fn.typeahead.defaults = {
-    source: []
-  , items: 8
-  , menu: '<ul class="typeahead dropdown-menu"></ul>'
-  , item: '<li><a href="#"></a></li>'
-  , minLength: 1
-  }
-
-  $.fn.typeahead.Constructor = Typeahead
-
-
- /* TYPEAHEAD NO CONFLICT
-  * =================== */
-
-  $.fn.typeahead.noConflict = function () {
-    $.fn.typeahead = old
-    return this
-  }
-
-
- /* TYPEAHEAD DATA-API
-  * ================== */
-
-  $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) {
-    var $this = $(this)
-    if ($this.data('typeahead')) return
-    $this.typeahead($this.data())
-  })
-
-}(window.jQuery);
+/*!
+ * typeahead.js 0.10.5
+ * https://github.com/twitter/typeahead.js
+ * Copyright 2013-2014 Twitter, Inc. and other contributors; Licensed MIT
+ */
+
+(function($) {
+    var _ = function() {
+        "use strict";
+        return {
+            isMsie: function() {
+                return /(msie|trident)/i.test(navigator.userAgent) ? navigator.userAgent.match(/(msie |rv:)(\d+(.\d+)?)/i)[2] : false;
+            },
+            isBlankString: function(str) {
+                return !str || /^\s*$/.test(str);
+            },
+            escapeRegExChars: function(str) {
+                return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
+            },
+            isString: function(obj) {
+                return typeof obj === "string";
+            },
+            isNumber: function(obj) {
+                return typeof obj === "number";
+            },
+            isArray: $.isArray,
+            isFunction: $.isFunction,
+            isObject: $.isPlainObject,
+            isUndefined: function(obj) {
+                return typeof obj === "undefined";
+            },
+            toStr: function toStr(s) {
+                return _.isUndefined(s) || s === null ? "" : s + "";
+            },
+            bind: $.proxy,
+            each: function(collection, cb) {
+                $.each(collection, reverseArgs);
+                function reverseArgs(index, value) {
+                    return cb(value, index);
+                }
+            },
+            map: $.map,
+            filter: $.grep,
+            every: function(obj, test) {
+                var result = true;
+                if (!obj) {
+                    return result;
+                }
+                $.each(obj, function(key, val) {
+                    if (!(result = test.call(null, val, key, obj))) {
+                        return false;
+                    }
+                });
+                return !!result;
+            },
+            some: function(obj, test) {
+                var result = false;
+                if (!obj) {
+                    return result;
+                }
+                $.each(obj, function(key, val) {
+                    if (result = test.call(null, val, key, obj)) {
+                        return false;
+                    }
+                });
+                return !!result;
+            },
+            mixin: $.extend,
+            getUniqueId: function() {
+                var counter = 0;
+                return function() {
+                    return counter++;
+                };
+            }(),
+            templatify: function templatify(obj) {
+                return $.isFunction(obj) ? obj : template;
+                function template() {
+                    return String(obj);
+                }
+            },
+            defer: function(fn) {
+                setTimeout(fn, 0);
+            },
+            debounce: function(func, wait, immediate) {
+                var timeout, result;
+                return function() {
+                    var context = this, args = arguments, later, callNow;
+                    later = function() {
+                        timeout = null;
+                        if (!immediate) {
+                            result = func.apply(context, args);
+                        }
+                    };
+                    callNow = immediate && !timeout;
+                    clearTimeout(timeout);
+                    timeout = setTimeout(later, wait);
+                    if (callNow) {
+                        result = func.apply(context, args);
+                    }
+                    return result;
+                };
+            },
+            throttle: function(func, wait) {
+                var context, args, timeout, result, previous, later;
+                previous = 0;
+                later = function() {
+                    previous = new Date();
+                    timeout = null;
+                    result = func.apply(context, args);
+                };
+                return function() {
+                    var now = new Date(), remaining = wait - (now - previous);
+                    context = this;
+                    args = arguments;
+                    if (remaining <= 0) {
+                        clearTimeout(timeout);
+                        timeout = null;
+                        previous = now;
+                        result = func.apply(context, args);
+                    } else if (!timeout) {
+                        timeout = setTimeout(later, remaining);
+                    }
+                    return result;
+                };
+            },
+            noop: function() {}
+        };
+    }();
+    var VERSION = "0.10.5";
+    var tokenizers = function() {
+        "use strict";
+        return {
+            nonword: nonword,
+            whitespace: whitespace,
+            obj: {
+                nonword: getObjTokenizer(nonword),
+                whitespace: getObjTokenizer(whitespace)
+            }
+        };
+        function whitespace(str) {
+            str = _.toStr(str);
+            return str ? str.split(/\s+/) : [];
+        }
+        function nonword(str) {
+            str = _.toStr(str);
+            return str ? str.split(/\W+/) : [];
+        }
+        function getObjTokenizer(tokenizer) {
+            return function setKey() {
+                var args = [].slice.call(arguments, 0);
+                return function tokenize(o) {
+                    var tokens = [];
+                    _.each(args, function(k) {
+                        tokens = tokens.concat(tokenizer(_.toStr(o[k])));
+                    });
+                    return tokens;
+                };
+            };
+        }
+    }();
+    var LruCache = function() {
+        "use strict";
+        function LruCache(maxSize) {
+            this.maxSize = _.isNumber(maxSize) ? maxSize : 100;
+            this.reset();
+            if (this.maxSize <= 0) {
+                this.set = this.get = $.noop;
+            }
+        }
+        _.mixin(LruCache.prototype, {
+            set: function set(key, val) {
+                var tailItem = this.list.tail, node;
+                if (this.size >= this.maxSize) {
+                    this.list.remove(tailItem);
+                    delete this.hash[tailItem.key];
+                }
+                if (node = this.hash[key]) {
+                    node.val = val;
+                    this.list.moveToFront(node);
+                } else {
+                    node = new Node(key, val);
+                    this.list.add(node);
+                    this.hash[key] = node;
+                    this.size++;
+                }
+            },
+            get: function get(key) {
+                var node = this.hash[key];
+                if (node) {
+                    this.list.moveToFront(node);
+                    return node.val;
+                }
+            },
+            reset: function reset() {
+                this.size = 0;
+                this.hash = {};
+                this.list = new List();
+            }
+        });
+        function List() {
+            this.head = this.tail = null;
+        }
+        _.mixin(List.prototype, {
+            add: function add(node) {
+                if (this.head) {
+                    node.next = this.head;
+                    this.head.prev = node;
+                }
+                this.head = node;
+                this.tail = this.tail || node;
+            },
+            remove: function remove(node) {
+                node.prev ? node.prev.next = node.next : this.head = node.next;
+                node.next ? node.next.prev = node.prev : this.tail = node.prev;
+            },
+            moveToFront: function(node) {
+                this.remove(node);
+                this.add(node);
+            }
+        });
+        function Node(key, val) {
+            this.key = key;
+            this.val = val;
+            this.prev = this.next = null;
+        }
+        return LruCache;
+    }();
+    var PersistentStorage = function() {
+        "use strict";
+        var ls, methods;
+        try {
+            ls = window.localStorage;
+            ls.setItem("~~~", "!");
+            ls.removeItem("~~~");
+        } catch (err) {
+            ls = null;
+        }
+        function PersistentStorage(namespace) {
+            this.prefix = [ "__", namespace, "__" ].join("");
+            this.ttlKey = "__ttl__";
+            this.keyMatcher = new RegExp("^" + _.escapeRegExChars(this.prefix));
+        }
+        if (ls && window.JSON) {
+            methods = {
+                _prefix: function(key) {
+                    return this.prefix + key;
+                },
+                _ttlKey: function(key) {
+                    return this._prefix(key) + this.ttlKey;
+                },
+                get: function(key) {
+                    if (this.isExpired(key)) {
+                        this.remove(key);
+                    }
+                    return decode(ls.getItem(this._prefix(key)));
+                },
+                set: function(key, val, ttl) {
+                    if (_.isNumber(ttl)) {
+                        ls.setItem(this._ttlKey(key), encode(now() + ttl));
+                    } else {
+                        ls.removeItem(this._ttlKey(key));
+                    }
+                    return ls.setItem(this._prefix(key), encode(val));
+                },
+                remove: function(key) {
+                    ls.removeItem(this._ttlKey(key));
+                    ls.removeItem(this._prefix(key));
+                    return this;
+                },
+                clear: function() {
+                    var i, key, keys = [], len = ls.length;
+                    for (i = 0; i < len; i++) {
+                        if ((key = ls.key(i)).match(this.keyMatcher)) {
+                            keys.push(key.replace(this.keyMatcher, ""));
+                        }
+                    }
+                    for (i = keys.length; i--; ) {
+                        this.remove(keys[i]);
+                    }
+                    return this;
+                },
+                isExpired: function(key) {
+                    var ttl = decode(ls.getItem(this._ttlKey(key)));
+                    return _.isNumber(ttl) && now() > ttl ? true : false;
+                }
+            };
+        } else {
+            methods = {
+                get: _.noop,
+                set: _.noop,
+                remove: _.noop,
+                clear: _.noop,
+                isExpired: _.noop
+            };
+        }
+        _.mixin(PersistentStorage.prototype, methods);
+        return PersistentStorage;
+        function now() {
+            return new Date().getTime();
+        }
+        function encode(val) {
+            return JSON.stringify(_.isUndefined(val) ? null : val);
+        }
+        function decode(val) {
+            return JSON.parse(val);
+        }
+    }();
+    var Transport = function() {
+        "use strict";
+        var pendingRequestsCount = 0, pendingRequests = {}, maxPendingRequests = 6, sharedCache = new LruCache(10);
+        function Transport(o) {
+            o = o || {};
+            this.cancelled = false;
+            this.lastUrl = null;
+            this._send = o.transport ? callbackToDeferred(o.transport) : $.ajax;
+            this._get = o.rateLimiter ? o.rateLimiter(this._get) : this._get;
+            this._cache = o.cache === false ? new LruCache(0) : sharedCache;
+        }
+        Transport.setMaxPendingRequests = function setMaxPendingRequests(num) {
+            maxPendingRequests = num;
+        };
+        Transport.resetCache = function resetCache() {
+            sharedCache.reset();
+        };
+        _.mixin(Transport.prototype, {
+            _get: function(url, o, cb) {
+                var that = this, jqXhr;
+                if (this.cancelled || url !== this.lastUrl) {
+                    return;
+                }
+                if (jqXhr = pendingRequests[url]) {
+                    jqXhr.done(done).fail(fail);
+                } else if (pendingRequestsCount < maxPendingRequests) {
+                    pendingRequestsCount++;
+                    pendingRequests[url] = this._send(url, o).done(done).fail(fail).always(always);
+                } else {
+                    this.onDeckRequestArgs = [].slice.call(arguments, 0);
+                }
+                function done(resp) {
+                    cb && cb(null, resp);
+                    that._cache.set(url, resp);
+                }
+                function fail() {
+                    cb && cb(true);
+                }
+                function always() {
+                    pendingRequestsCount--;
+                    delete pendingRequests[url];
+                    if (that.onDeckRequestArgs) {
+                        that._get.apply(that, that.onDeckRequestArgs);
+                        that.onDeckRequestArgs = null;
+                    }
+                }
+            },
+            get: function(url, o, cb) {
+                var resp;
+                if (_.isFunction(o)) {
+                    cb = o;
+                    o = {};
+                }
+                this.cancelled = false;
+                this.lastUrl = url;
+                if (resp = this._cache.get(url)) {
+                    _.defer(function() {
+                        cb && cb(null, resp);
+                    });
+                } else {
+                    this._get(url, o, cb);
+                }
+                return !!resp;
+            },
+            cancel: function() {
+                this.cancelled = true;
+            }
+        });
+        return Transport;
+        function callbackToDeferred(fn) {
+            return function customSendWrapper(url, o) {
+                var deferred = $.Deferred();
+                fn(url, o, onSuccess, onError);
+                return deferred;
+                function onSuccess(resp) {
+                    _.defer(function() {
+                        deferred.resolve(resp);
+                    });
+                }
+                function onError(err) {
+                    _.defer(function() {
+                        deferred.reject(err);
+                    });
+                }
+            };
+        }
+    }();
+    var SearchIndex = function() {
+        "use strict";
+        function SearchIndex(o) {
+            o = o || {};
+            if (!o.datumTokenizer || !o.queryTokenizer) {
+                $.error("datumTokenizer and queryTokenizer are both required");
+            }
+            this.datumTokenizer = o.datumTokenizer;
+            this.queryTokenizer = o.queryTokenizer;
+            this.reset();
+        }
+        _.mixin(SearchIndex.prototype, {
+            bootstrap: function bootstrap(o) {
+                this.datums = o.datums;
+                this.trie = o.trie;
+            },
+            add: function(data) {
+                var that = this;
+                data = _.isArray(data) ? data : [ data ];
+                _.each(data, function(datum) {
+                    var id, tokens;
+                    id = that.datums.push(datum) - 1;
+                    tokens = normalizeTokens(that.datumTokenizer(datum));
+                    _.each(tokens, function(token) {
+                        var node, chars, ch;
+                        node = that.trie;
+                        chars = token.split("");
+                        while (ch = chars.shift()) {
+                            node = node.children[ch] || (node.children[ch] = newNode());
+                            node.ids.push(id);
+                        }
+                    });
+                });
+            },
+            get: function get(query) {
+                var that = this, tokens, matches;
+                tokens = normalizeTokens(this.queryTokenizer(query));
+                _.each(tokens, function(token) {
+                    var node, chars, ch, ids;
+                    if (matches && matches.length === 0) {
+                        return false;
+                    }
+                    node = that.trie;
+                    chars = token.split("");
+                    while (node && (ch = chars.shift())) {
+                        node = node.children[ch];
+                    }
+                    if (node && chars.length === 0) {
+                        ids = node.ids.slice(0);
+                        matches = matches ? getIntersection(matches, ids) : ids;
+                    } else {
+                        matches = [];
+                        return false;
+                    }
+                });
+                return matches ? _.map(unique(matches), function(id) {
+                    return that.datums[id];
+                }) : [];
+            },
+            reset: function reset() {
+                this.datums = [];
+                this.trie = newNode();
+            },
+            serialize: function serialize() {
+                return {
+                    datums: this.datums,
+                    trie: this.trie
+                };
+            }
+        });
+        return SearchIndex;
+        function normalizeTokens(tokens) {
+            tokens = _.filter(tokens, function(token) {
+                return !!token;
+            });
+            tokens = _.map(tokens, function(token) {
+                return token.toLowerCase();
+            });
+            return tokens;
+        }
+        function newNode() {
+            return {
+                ids: [],
+                children: {}
+            };
+        }
+        function unique(array) {
+            var seen = {}, uniques = [];
+            for (var i = 0, len = array.length; i < len; i++) {
+                if (!seen[array[i]]) {
+                    seen[array[i]] = true;
+                    uniques.push(array[i]);
+                }
+            }
+            return uniques;
+        }
+        function getIntersection(arrayA, arrayB) {
+            var ai = 0, bi = 0, intersection = [];
+            arrayA = arrayA.sort(compare);
+            arrayB = arrayB.sort(compare);
+            var lenArrayA = arrayA.length, lenArrayB = arrayB.length;
+            while (ai < lenArrayA && bi < lenArrayB) {
+                if (arrayA[ai] < arrayB[bi]) {
+                    ai++;
+                } else if (arrayA[ai] > arrayB[bi]) {
+                    bi++;
+                } else {
+                    intersection.push(arrayA[ai]);
+                    ai++;
+                    bi++;
+                }
+            }
+            return intersection;
+            function compare(a, b) {
+                return a - b;
+            }
+        }
+    }();
+    var oParser = function() {
+        "use strict";
+        return {
+            local: getLocal,
+            prefetch: getPrefetch,
+            remote: getRemote
+        };
+        function getLocal(o) {
+            return o.local || null;
+        }
+        function getPrefetch(o) {
+            var prefetch, defaults;
+            defaults = {
+                url: null,
+                thumbprint: "",
+                ttl: 24 * 60 * 60 * 1e3,
+                filter: null,
+                ajax: {}
+            };
+            if (prefetch = o.prefetch || null) {
+                prefetch = _.isString(prefetch) ? {
+                    url: prefetch
+                } : prefetch;
+                prefetch = _.mixin(defaults, prefetch);
+                prefetch.thumbprint = VERSION + prefetch.thumbprint;
+                prefetch.ajax.type = prefetch.ajax.type || "GET";
+                prefetch.ajax.dataType = prefetch.ajax.dataType || "json";
+                !prefetch.url && $.error("prefetch requires url to be set");
+            }
+            return prefetch;
+        }
+        function getRemote(o) {
+            var remote, defaults;
+            defaults = {
+                url: null,
+                cache: true,
+                wildcard: "%QUERY",
+                replace: null,
+                rateLimitBy: "debounce",
+                rateLimitWait: 300,
+                send: null,
+                filter: null,
+                ajax: {}
+            };
+            if (remote = o.remote || null) {
+                remote = _.isString(remote) ? {
+                    url: remote
+                } : remote;
+                remote = _.mixin(defaults, remote);
+                remote.rateLimiter = /^throttle$/i.test(remote.rateLimitBy) ? byThrottle(remote.rateLimitWait) : byDebounce(remote.rateLimitWait);
+                remote.ajax.type = remote.ajax.type || "GET";
+                remote.ajax.dataType = remote.ajax.dataType || "json";
+                delete remote.rateLimitBy;
+                delete remote.rateLimitWait;
+                !remote.url && $.error("remote requires url to be set");
+            }
+            return remote;
+            function byDebounce(wait) {
+                return function(fn) {
+                    return _.debounce(fn, wait);
+                };
+            }
+            function byThrottle(wait) {
+                return function(fn) {
+                    return _.throttle(fn, wait);
+                };
+            }
+        }
+    }();
+    (function(root) {
+        "use strict";
+        var old, keys;
+        old = root.Bloodhound;
+        keys = {
+            data: "data",
+            protocol: "protocol",
+            thumbprint: "thumbprint"
+        };
+        root.Bloodhound = Bloodhound;
+        function Bloodhound(o) {
+            if (!o || !o.local && !o.prefetch && !o.remote) {
+                $.error("one of local, prefetch, or remote is required");
+            }
+            this.limit = o.limit || 5;
+            this.sorter = getSorter(o.sorter);
+            this.dupDetector = o.dupDetector || ignoreDuplicates;
+            this.local = oParser.local(o);
+            this.prefetch = oParser.prefetch(o);
+            this.remote = oParser.remote(o);
+            this.cacheKey = this.prefetch ? this.prefetch.cacheKey || this.prefetch.url : null;
+            this.index = new SearchIndex({
+                datumTokenizer: o.datumTokenizer,
+                queryTokenizer: o.queryTokenizer
+            });
+            this.storage = this.cacheKey ? new PersistentStorage(this.cacheKey) : null;
+        }
+        Bloodhound.noConflict = function noConflict() {
+            root.Bloodhound = old;
+            return Bloodhound;
+        };
+        Bloodhound.tokenizers = tokenizers;
+        _.mixin(Bloodhound.prototype, {
+            _loadPrefetch: function loadPrefetch(o) {
+                var that = this, serialized, deferred;
+                if (serialized = this._readFromStorage(o.thumbprint)) {
+                    this.index.bootstrap(serialized);
+                    deferred = $.Deferred().resolve();
+                } else {
+                    deferred = $.ajax(o.url, o.ajax).done(handlePrefetchResponse);
+                }
+                return deferred;
+                function handlePrefetchResponse(resp) {
+                    that.clear();
+                    that.add(o.filter ? o.filter(resp) : resp);
+                    that._saveToStorage(that.index.serialize(), o.thumbprint, o.ttl);
+                }
+            },
+            _getFromRemote: function getFromRemote(query, cb) {
+                var that = this, url, uriEncodedQuery;
+                if (!this.transport) {
+                    return;
+                }
+                query = query || "";
+                uriEncodedQuery = encodeURIComponent(query);
+                url = this.remote.replace ? this.remote.replace(this.remote.url, query) : this.remote.url.replace(this.remote.wildcard, uriEncodedQuery);
+                return this.transport.get(url, this.remote.ajax, handleRemoteResponse);
+                function handleRemoteResponse(err, resp) {
+                    err ? cb([]) : cb(that.remote.filter ? that.remote.filter(resp) : resp);
+                }
+            },
+            _cancelLastRemoteRequest: function cancelLastRemoteRequest() {
+                this.transport && this.transport.cancel();
+            },
+            _saveToStorage: function saveToStorage(data, thumbprint, ttl) {
+                if (this.storage) {
+                    this.storage.set(keys.data, data, ttl);
+                    this.storage.set(keys.protocol, location.protocol, ttl);
+                    this.storage.set(keys.thumbprint, thumbprint, ttl);
+                }
+            },
+            _readFromStorage: function readFromStorage(thumbprint) {
+                var stored = {}, isExpired;
+                if (this.storage) {
+                    stored.data = this.storage.get(keys.data);
+                    stored.protocol = this.storage.get(keys.protocol);
+                    stored.thumbprint = this.storage.get(keys.thumbprint);
+                }
+                isExpired = stored.thumbprint !== thumbprint || stored.protocol !== location.protocol;
+                return stored.data && !isExpired ? stored.data : null;
+            },
+            _initialize: function initialize() {
+                var that = this, local = this.local, deferred;
+                deferred = this.prefetch ? this._loadPrefetch(this.prefetch) : $.Deferred().resolve();
+                local && deferred.done(addLocalToIndex);
+                this.transport = this.remote ? new Transport(this.remote) : null;
+                return this.initPromise = deferred.promise();
+                function addLocalToIndex() {
+                    that.add(_.isFunction(local) ? local() : local);
+                }
+            },
+            initialize: function initialize(force) {
+                return !this.initPromise || force ? this._initialize() : this.initPromise;
+            },
+            add: function add(data) {
+                this.index.add(data);
+            },
+            get: function get(query, cb) {
+                var that = this, matches = [], cacheHit = false;
+                matches = this.index.get(query);
+                matches = this.sorter(matches).slice(0, this.limit);
+                matches.length < this.limit ? cacheHit = this._getFromRemote(query, returnRemoteMatches) : this._cancelLastRemoteRequest();
+                if (!cacheHit) {
+                    (matches.length > 0 || !this.transport) && cb && cb(matches);
+                }
+                function returnRemoteMatches(remoteMatches) {
+                    var matchesWithBackfill = matches.slice(0);
+                    _.each(remoteMatches, function(remoteMatch) {
+                        var isDuplicate;
+                        isDuplicate = _.some(matchesWithBackfill, function(match) {
+                            return that.dupDetector(remoteMatch, match);
+                        });
+                        !isDuplicate && matchesWithBackfill.push(remoteMatch);
+                        return matchesWithBackfill.length < that.limit;
+                    });
+                    cb && cb(that.sorter(matchesWithBackfill));
+                }
+            },
+            clear: function clear() {
+                this.index.reset();
+            },
+            clearPrefetchCache: function clearPrefetchCache() {
+                this.storage && this.storage.clear();
+            },
+            clearRemoteCache: function clearRemoteCache() {
+                this.transport && Transport.resetCache();
+            },
+            ttAdapter: function ttAdapter() {
+                return _.bind(this.get, this);
+            }
+        });
+        return Bloodhound;
+        function getSorter(sortFn) {
+            return _.isFunction(sortFn) ? sort : noSort;
+            function sort(array) {
+                return array.sort(sortFn);
+            }
+            function noSort(array) {
+                return array;
+            }
+        }
+        function ignoreDuplicates() {
+            return false;
+        }
+    })(this);
+    var html = function() {
+        return {
+            wrapper: '<span class="twitter-typeahead"></span>',
+            dropdown: '<span class="tt-dropdown-menu"></span>',
+            dataset: '<div class="tt-dataset-%CLASS%"></div>',
+            suggestions: '<span class="tt-suggestions"></span>',
+            suggestion: '<div class="tt-suggestion"></div>'
+        };
+    }();
+    var css = function() {
+        "use strict";
+        var css = {
+            wrapper: {
+                position: "relative",
+                display: "inline-block"
+            },
+            hint: {
+                position: "absolute",
+                top: "0",
+                left: "0",
+                borderColor: "transparent",
+                boxShadow: "none",
+                opacity: "1"
+            },
+            input: {
+                position: "relative",
+                verticalAlign: "top",
+                backgroundColor: "transparent"
+            },
+            inputWithNoHint: {
+                position: "relative",
+                verticalAlign: "top"
+            },
+            dropdown: {
+                position: "absolute",
+                top: "100%",
+                left: "0",
+                zIndex: "100",
+                display: "none"
+            },
+            suggestions: {
+                display: "block"
+            },
+            suggestion: {
+                whiteSpace: "nowrap",
+                cursor: "pointer"
+            },
+            suggestionChild: {
+                whiteSpace: "normal"
+            },
+            ltr: {
+                left: "0",
+                right: "auto"
+            },
+            rtl: {
+                left: "auto",
+                right: " 0"
+            }
+        };
+        if (_.isMsie()) {
+            _.mixin(css.input, {
+                backgroundImage: "url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)"
+            });
+        }
+        if (_.isMsie() && _.isMsie() <= 7) {
+            _.mixin(css.input, {
+                marginTop: "-1px"
+            });
+        }
+        return css;
+    }();
+    var EventBus = function() {
+        "use strict";
+        var namespace = "typeahead:";
+        function EventBus(o) {
+            if (!o || !o.el) {
+                $.error("EventBus initialized without el");
+            }
+            this.$el = $(o.el);
+        }
+        _.mixin(EventBus.prototype, {
+            trigger: function(type) {
+                var args = [].slice.call(arguments, 1);
+                this.$el.trigger(namespace + type, args);
+            }
+        });
+        return EventBus;
+    }();
+    var EventEmitter = function() {
+        "use strict";
+        var splitter = /\s+/, nextTick = getNextTick();
+        return {
+            onSync: onSync,
+            onAsync: onAsync,
+            off: off,
+            trigger: trigger
+        };
+        function on(method, types, cb, context) {
+            var type;
+            if (!cb) {
+                return this;
+            }
+            types = types.split(splitter);
+            cb = context ? bindContext(cb, context) : cb;
+            this._callbacks = this._callbacks || {};
+            while (type = types.shift()) {
+                this._callbacks[type] = this._callbacks[type] || {
+                    sync: [],
+                    async: []
+                };
+                this._callbacks[type][method].push(cb);
+            }
+            return this;
+        }
+        function onAsync(types, cb, context) {
+            return on.call(this, "async", types, cb, context);
+        }
+        function onSync(types, cb, context) {
+            return on.call(this, "sync", types, cb, context);
+        }
+        function off(types) {
+            var type;
+            if (!this._callbacks) {
+                return this;
+            }
+            types = types.split(splitter);
+            while (type = types.shift()) {
+                delete this._callbacks[type];
+            }
+            return this;
+        }
+        function trigger(types) {
+            var type, callbacks, args, syncFlush, asyncFlush;
+            if (!this._callbacks) {
+                return this;
+            }
+            types = types.split(splitter);
+            args = [].slice.call(arguments, 1);
+            while ((type = types.shift()) && (callbacks = this._callbacks[type])) {
+                syncFlush = getFlush(callbacks.sync, this, [ type ].concat(args));
+                asyncFlush = getFlush(callbacks.async, this, [ type ].concat(args));
+                syncFlush() && nextTick(asyncFlush);
+            }
+            return this;
+        }
+        function getFlush(callbacks, context, args) {
+            return flush;
+            function flush() {
+                var cancelled;
+                for (var i = 0, len = callbacks.length; !cancelled && i < len; i += 1) {
+                    cancelled = callbacks[i].apply(context, args) === false;
+                }
+                return !cancelled;
+            }
+        }
+        function getNextTick() {
+            var nextTickFn;
+            if (window.setImmediate) {
+                nextTickFn = function nextTickSetImmediate(fn) {
+                    setImmediate(function() {
+                        fn();
+                    });
+                };
+            } else {
+                nextTickFn = function nextTickSetTimeout(fn) {
+                    setTimeout(function() {
+                        fn();
+                    }, 0);
+                };
+            }
+            return nextTickFn;
+        }
+        function bindContext(fn, context) {
+            return fn.bind ? fn.bind(context) : function() {
+                fn.apply(context, [].slice.call(arguments, 0));
+            };
+        }
+    }();
+    var highlight = function(doc) {
+        "use strict";
+        var defaults = {
+            node: null,
+            pattern: null,
+            tagName: "strong",
+            className: null,
+            wordsOnly: false,
+            caseSensitive: false
+        };
+        return function hightlight(o) {
+            var regex;
+            o = _.mixin({}, defaults, o);
+            if (!o.node || !o.pattern) {
+                return;
+            }
+            o.pattern = _.isArray(o.pattern) ? o.pattern : [ o.pattern ];
+            regex = getRegex(o.pattern, o.caseSensitive, o.wordsOnly);
+            traverse(o.node, hightlightTextNode);
+            function hightlightTextNode(textNode) {
+                var match, patternNode, wrapperNode;
+                if (match = regex.exec(textNode.data)) {
+                    wrapperNode = doc.createElement(o.tagName);
+                    o.className && (wrapperNode.className = o.className);
+                    patternNode = textNode.splitText(match.index);
+                    patternNode.splitText(match[0].length);
+                    wrapperNode.appendChild(patternNode.cloneNode(true));
+                    textNode.parentNode.replaceChild(wrapperNode, patternNode);
+                }
+                return !!match;
+            }
+            function traverse(el, hightlightTextNode) {
+                var childNode, TEXT_NODE_TYPE = 3;
+                for (var i = 0; i < el.childNodes.length; i++) {
+                    childNode = el.childNodes[i];
+                    if (childNode.nodeType === TEXT_NODE_TYPE) {
+                        i += hightlightTextNode(childNode) ? 1 : 0;
+                    } else {
+                        traverse(childNode, hightlightTextNode);
+                    }
+                }
+            }
+        };
+        function getRegex(patterns, caseSensitive, wordsOnly) {
+            var escapedPatterns = [], regexStr;
+            for (var i = 0, len = patterns.length; i < len; i++) {
+                escapedPatterns.push(_.escapeRegExChars(patterns[i]));
+            }
+            regexStr = wordsOnly ? "\\b(" + escapedPatterns.join("|") + ")\\b" : "(" + escapedPatterns.join("|") + ")";
+            return caseSensitive ? new RegExp(regexStr) : new RegExp(regexStr, "i");
+        }
+    }(window.document);
+    var Input = function() {
+        "use strict";
+        var specialKeyCodeMap;
+        specialKeyCodeMap = {
+            9: "tab",
+            27: "esc",
+            37: "left",
+            39: "right",
+            13: "enter",
+            38: "up",
+            40: "down"
+        };
+        function Input(o) {
+            var that = this, onBlur, onFocus, onKeydown, onInput;
+            o = o || {};
+            if (!o.input) {
+                $.error("input is missing");
+            }
+            onBlur = _.bind(this._onBlur, this);
+            onFocus = _.bind(this._onFocus, this);
+            onKeydown = _.bind(this._onKeydown, this);
+            onInput = _.bind(this._onInput, this);
+            this.$hint = $(o.hint);
+            this.$input = $(o.input).on("blur.tt", onBlur).on("focus.tt", onFocus).on("keydown.tt", onKeydown);
+            if (this.$hint.length === 0) {
+                this.setHint = this.getHint = this.clearHint = this.clearHintIfInvalid = _.noop;
+            }
+            if (!_.isMsie()) {
+                this.$input.on("input.tt", onInput);
+            } else {
+                this.$input.on("keydown.tt keypress.tt cut.tt paste.tt", function($e) {
+                    if (specialKeyCodeMap[$e.which || $e.keyCode]) {
+                        return;
+                    }
+                    _.defer(_.bind(that._onInput, that, $e));
+                });
+            }
+            this.query = this.$input.val();
+            this.$overflowHelper = buildOverflowHelper(this.$input);
+        }
+        Input.normalizeQuery = function(str) {
+            return (str || "").replace(/^\s*/g, "").replace(/\s{2,}/g, " ");
+        };
+        _.mixin(Input.prototype, EventEmitter, {
+            _onBlur: function onBlur() {
+                this.resetInputValue();
+                this.trigger("blurred");
+            },
+            _onFocus: function onFocus() {
+                this.trigger("focused");
+            },
+            _onKeydown: function onKeydown($e) {
+                var keyName = specialKeyCodeMap[$e.which || $e.keyCode];
+                this._managePreventDefault(keyName, $e);
+                if (keyName && this._shouldTrigger(keyName, $e)) {
+                    this.trigger(keyName + "Keyed", $e);
+                }
+            },
+            _onInput: function onInput() {
+                this._checkInputValue();
+            },
+            _managePreventDefault: function managePreventDefault(keyName, $e) {
+                var preventDefault, hintValue, inputValue;
+                switch (keyName) {
+                  case "tab":
+                    hintValue = this.getHint();
+                    inputValue = this.getInputValue();
+                    preventDefault = hintValue && hintValue !== inputValue && !withModifier($e);
+                    break;
+
+                  case "up":
+                  case "down":
+                    preventDefault = !withModifier($e);
+                    break;
+
+                  default:
+                    preventDefault = false;
+                }
+                preventDefault && $e.preventDefault();
+            },
+            _shouldTrigger: function shouldTrigger(keyName, $e) {
+                var trigger;
+                switch (keyName) {
+                  case "tab":
+                    trigger = !withModifier($e);
+                    break;
+
+                  default:
+                    trigger = true;
+                }
+                return trigger;
+            },
+            _checkInputValue: function checkInputValue() {
+                var inputValue, areEquivalent, hasDifferentWhitespace;
+                inputValue = this.getInputValue();
+                areEquivalent = areQueriesEquivalent(inputValue, this.query);
+                hasDifferentWhitespace = areEquivalent ? this.query.length !== inputValue.length : false;
+                this.query = inputValue;
+                if (!areEquivalent) {
+                    this.trigger("queryChanged", this.query);
+                } else if (hasDifferentWhitespace) {
+                    this.trigger("whitespaceChanged", this.query);
+                }
+            },
+            focus: function focus() {
+                this.$input.focus();
+            },
+            blur: function blur() {
+                this.$input.blur();
+            },
+            getQuery: function getQuery() {
+                return this.query;
+            },
+            setQuery: function setQuery(query) {
+                this.query = query;
+            },
+            getInputValue: function getInputValue() {
+                return this.$input.val();
+            },
+            setInputValue: function setInputValue(value, silent) {
+                this.$input.val(value);
+                silent ? this.clearHint() : this._checkInputValue();
+            },
+            resetInputValue: function resetInputValue() {
+                this.setInputValue(this.query, true);
+            },
+            getHint: function getHint() {
+                return this.$hint.val();
+            },
+            setHint: function setHint(value) {
+                this.$hint.val(value);
+            },
+            clearHint: function clearHint() {
+                this.setHint("");
+            },
+            clearHintIfInvalid: function clearHintIfInvalid() {
+                var val, hint, valIsPrefixOfHint, isValid;
+                val = this.getInputValue();
+                hint = this.getHint();
+                valIsPrefixOfHint = val !== hint && hint.indexOf(val) === 0;
+                isValid = val !== "" && valIsPrefixOfHint && !this.hasOverflow();
+                !isValid && this.clearHint();
+            },
+            getLanguageDirection: function getLanguageDirection() {
+                return (this.$input.css("direction") || "ltr").toLowerCase();
+            },
+            hasOverflow: function hasOverflow() {
+                var constraint = this.$input.width() - 2;
+                this.$overflowHelper.text(this.getInputValue());
+                return this.$overflowHelper.width() >= constraint;
+            },
+            isCursorAtEnd: function() {
+                var valueLength, selectionStart, range;
+                valueLength = this.$input.val().length;
+                selectionStart = this.$input[0].selectionStart;
+                if (_.isNumber(selectionStart)) {
+                    return selectionStart === valueLength;
+                } else if (document.selection) {
+                    range = document.selection.createRange();
+                    range.moveStart("character", -valueLength);
+                    return valueLength === range.text.length;
+                }
+                return true;
+            },
+            destroy: function destroy() {
+                this.$hint.off(".tt");
+                this.$input.off(".tt");
+                this.$hint = this.$input = this.$overflowHelper = null;
+            }
+        });
+        return Input;
+        function buildOverflowHelper($input) {
+            return $('<pre aria-hidden="true"></pre>').css({
+                position: "absolute",
+                visibility: "hidden",
+                whiteSpace: "pre",
+                fontFamily: $input.css("font-family"),
+                fontSize: $input.css("font-size"),
+                fontStyle: $input.css("font-style"),
+                fontVariant: $input.css("font-variant"),
+                fontWeight: $input.css("font-weight"),
+                wordSpacing: $input.css("word-spacing"),
+                letterSpacing: $input.css("letter-spacing"),
+                textIndent: $input.css("text-indent"),
+                textRendering: $input.css("text-rendering"),
+                textTransform: $input.css("text-transform")
+            }).insertAfter($input);
+        }
+        function areQueriesEquivalent(a, b) {
+            return Input.normalizeQuery(a) === Input.normalizeQuery(b);
+        }
+        function withModifier($e) {
+            return $e.altKey || $e.ctrlKey || $e.metaKey || $e.shiftKey;
+        }
+    }();
+    var Dataset = function() {
+        "use strict";
+        var datasetKey = "ttDataset", valueKey = "ttValue", datumKey = "ttDatum";
+        function Dataset(o) {
+            o = o || {};
+            o.templates = o.templates || {};
+            if (!o.source) {
+                $.error("missing source");
+            }
+            if (o.name && !isValidName(o.name)) {
+                $.error("invalid dataset name: " + o.name);
+            }
+            this.query = null;
+            this.highlight = !!o.highlight;
+            this.name = o.name || _.getUniqueId();
+            this.source = o.source;
+            this.displayFn = getDisplayFn(o.display || o.displayKey);
+            this.templates = getTemplates(o.templates, this.displayFn);
+            this.$el = $(html.dataset.replace("%CLASS%", this.name));
+        }
+        Dataset.extractDatasetName = function extractDatasetName(el) {
+            return $(el).data(datasetKey);
+        };
+        Dataset.extractValue = function extractDatum(el) {
+            return $(el).data(valueKey);
+        };
+        Dataset.extractDatum = function extractDatum(el) {
+            return $(el).data(datumKey);
+        };
+        _.mixin(Dataset.prototype, EventEmitter, {
+            _render: function render(query, suggestions) {
+                if (!this.$el) {
+                    return;
+                }
+                var that = this, hasSuggestions;
+                this.$el.empty();
+                hasSuggestions = suggestions && suggestions.length;
+                if (!hasSuggestions && this.templates.empty) {
+                    this.$el.html(getEmptyHtml()).prepend(that.templates.header ? getHeaderHtml() : null).append(that.templates.footer ? getFooterHtml() : null);
+                } else if (hasSuggestions) {
+                    this.$el.html(getSuggestionsHtml()).prepend(that.templates.header ? getHeaderHtml() : null).append(that.templates.footer ? getFooterHtml() : null);
+                }
+                this.trigger("rendered");
+                function getEmptyHtml() {
+                    return that.templates.empty({
+                        query: query,
+                        isEmpty: true
+                    });
+                }
+                function getSuggestionsHtml() {
+                    var $suggestions, nodes;
+                    $suggestions = $(html.suggestions).css(css.suggestions);
+                    nodes = _.map(suggestions, getSuggestionNode);
+                    $suggestions.append.apply($suggestions, nodes);
+                    that.highlight && highlight({
+                        className: "tt-highlight",
+                        node: $suggestions[0],
+                        pattern: query
+                    });
+                    return $suggestions;
+                    function getSuggestionNode(suggestion) {
+                        var $el;
+                        $el = $(html.suggestion).append(that.templates.suggestion(suggestion)).data(datasetKey, that.name).data(valueKey, that.displayFn(suggestion)).data(datumKey, suggestion);
+                        $el.children().each(function() {
+                            $(this).css(css.suggestionChild);
+                        });
+                        return $el;
+                    }
+                }
+                function getHeaderHtml() {
+                    return that.templates.header({
+                        query: query,
+                        isEmpty: !hasSuggestions
+                    });
+                }
+                function getFooterHtml() {
+                    return that.templates.footer({
+                        query: query,
+                        isEmpty: !hasSuggestions
+                    });
+                }
+            },
+            getRoot: function getRoot() {
+                return this.$el;
+            },
+            update: function update(query) {
+                var that = this;
+                this.query = query;
+                this.canceled = false;
+                this.source(query, render);
+                function render(suggestions) {
+                    if (!that.canceled && query === that.query) {
+                        that._render(query, suggestions);
+                    }
+                }
+            },
+            cancel: function cancel() {
+                this.canceled = true;
+            },
+            clear: function clear() {
+                this.cancel();
+                this.$el.empty();
+                this.trigger("rendered");
+            },
+            isEmpty: function isEmpty() {
+                return this.$el.is(":empty");
+            },
+            destroy: function destroy() {
+                this.$el = null;
+            }
+        });
+        return Dataset;
+        function getDisplayFn(display) {
+            display = display || "value";
+            return _.isFunction(display) ? display : displayFn;
+            function displayFn(obj) {
+                return obj[display];
+            }
+        }
+        function getTemplates(templates, displayFn) {
+            return {
+                empty: templates.empty && _.templatify(templates.empty),
+                header: templates.header && _.templatify(templates.header),
+                footer: templates.footer && _.templatify(templates.footer),
+                suggestion: templates.suggestion || suggestionTemplate
+            };
+            function suggestionTemplate(context) {
+                return "<p>" + displayFn(context) + "</p>";
+            }
+        }
+        function isValidName(str) {
+            return /^[_a-zA-Z0-9-]+$/.test(str);
+        }
+    }();
+    var Dropdown = function() {
+        "use strict";
+        function Dropdown(o) {
+            var that = this, onSuggestionClick, onSuggestionMouseEnter, onSuggestionMouseLeave;
+            o = o || {};
+            if (!o.menu) {
+                $.error("menu is required");
+            }
+            this.isOpen = false;
+            this.isEmpty = true;
+            this.datasets = _.map(o.datasets, initializeDataset);
+            onSuggestionClick = _.bind(this._onSuggestionClick, this);
+            onSuggestionMouseEnter = _.bind(this._onSuggestionMouseEnter, this);
+            onSuggestionMouseLeave = _.bind(this._onSuggestionMouseLeave, this);
+            this.$menu = $(o.menu).on("click.tt", ".tt-suggestion", onSuggestionClick).on("mouseenter.tt", ".tt-suggestion", onSuggestionMouseEnter).on("mouseleave.tt", ".tt-suggestion", onSuggestionMouseLeave);
+            _.each(this.datasets, function(dataset) {
+                that.$menu.append(dataset.getRoot());
+                dataset.onSync("rendered", that._onRendered, that);
+            });
+        }
+        _.mixin(Dropdown.prototype, EventEmitter, {
+            _onSuggestionClick: function onSuggestionClick($e) {
+                this.trigger("suggestionClicked", $($e.currentTarget));
+            },
+            _onSuggestionMouseEnter: function onSuggestionMouseEnter($e) {
+                this._removeCursor();
+                this._setCursor($($e.currentTarget), true);
+            },
+            _onSuggestionMouseLeave: function onSuggestionMouseLeave() {
+                this._removeCursor();
+            },
+            _onRendered: function onRendered() {
+                this.isEmpty = _.every(this.datasets, isDatasetEmpty);
+                this.isEmpty ? this._hide() : this.isOpen && this._show();
+                this.trigger("datasetRendered");
+                function isDatasetEmpty(dataset) {
+                    return dataset.isEmpty();
+                }
+            },
+            _hide: function() {
+                this.$menu.hide();
+            },
+            _show: function() {
+                this.$menu.css("display", "block");
+            },
+            _getSuggestions: function getSuggestions() {
+                return this.$menu.find(".tt-suggestion");
+            },
+            _getCursor: function getCursor() {
+                return this.$menu.find(".tt-cursor").first();
+            },
+            _setCursor: function setCursor($el, silent) {
+                $el.first().addClass("tt-cursor");
+                !silent && this.trigger("cursorMoved");
+            },
+            _removeCursor: function removeCursor() {
+                this._getCursor().removeClass("tt-cursor");
+            },
+            _moveCursor: function moveCursor(increment) {
+                var $suggestions, $oldCursor, newCursorIndex, $newCursor;
+                if (!this.isOpen) {
+                    return;
+                }
+                $oldCursor = this._getCursor();
+                $suggestions = this._getSuggestions();
+                this._removeCursor();
+                newCursorIndex = $suggestions.index($oldCursor) + increment;
+                newCursorIndex = (newCursorIndex + 1) % ($suggestions.length + 1) - 1;
+                if (newCursorIndex === -1) {
+                    this.trigger("cursorRemoved");
+                    return;
+                } else if (newCursorIndex < -1) {
+                    newCursorIndex = $suggestions.length - 1;
+                }
+                this._setCursor($newCursor = $suggestions.eq(newCursorIndex));
+                this._ensureVisible($newCursor);
+            },
+            _ensureVisible: function ensureVisible($el) {
+                var elTop, elBottom, menuScrollTop, menuHeight;
+                elTop = $el.position().top;
+                elBottom = elTop + $el.outerHeight(true);
+                menuScrollTop = this.$menu.scrollTop();
+                menuHeight = this.$menu.height() + parseInt(this.$menu.css("paddingTop"), 10) + parseInt(this.$menu.css("paddingBottom"), 10);
+                if (elTop < 0) {
+                    this.$menu.scrollTop(menuScrollTop + elTop);
+                } else if (menuHeight < elBottom) {
+                    this.$menu.scrollTop(menuScrollTop + (elBottom - menuHeight));
+                }
+            },
+            close: function close() {
+                if (this.isOpen) {
+                    this.isOpen = false;
+                    this._removeCursor();
+                    this._hide();
+                    this.trigger("closed");
+                }
+            },
+            open: function open() {
+                if (!this.isOpen) {
+                    this.isOpen = true;
+                    !this.isEmpty && this._show();
+                    this.trigger("opened");
+                }
+            },
+            setLanguageDirection: function setLanguageDirection(dir) {
+                this.$menu.css(dir === "ltr" ? css.ltr : css.rtl);
+            },
+            moveCursorUp: function moveCursorUp() {
+                this._moveCursor(-1);
+            },
+            moveCursorDown: function moveCursorDown() {
+                this._moveCursor(+1);
+            },
+            getDatumForSuggestion: function getDatumForSuggestion($el) {
+                var datum = null;
+                if ($el.length) {
+                    datum = {
+                        raw: Dataset.extractDatum($el),
+                        value: Dataset.extractValue($el),
+                        datasetName: Dataset.extractDatasetName($el)
+                    };
+                }
+                return datum;
+            },
+            getDatumForCursor: function getDatumForCursor() {
+                return this.getDatumForSuggestion(this._getCursor().first());
+            },
+            getDatumForTopSuggestion: function getDatumForTopSuggestion() {
+                return this.getDatumForSuggestion(this._getSuggestions().first());
+            },
+            update: function update(query) {
+                _.each(this.datasets, updateDataset);
+                function updateDataset(dataset) {
+                    dataset.update(query);
+                }
+            },
+            empty: function empty() {
+                _.each(this.datasets, clearDataset);
+                this.isEmpty = true;
+                function clearDataset(dataset) {
+                    dataset.clear();
+                }
+            },
+            isVisible: function isVisible() {
+                return this.isOpen && !this.isEmpty;
+            },
+            destroy: function destroy() {
+                this.$menu.off(".tt");
+                this.$menu = null;
+                _.each(this.datasets, destroyDataset);
+                function destroyDataset(dataset) {
+                    dataset.destroy();
+                }
+            }
+        });
+        return Dropdown;
+        function initializeDataset(oDataset) {
+            return new Dataset(oDataset);
+        }
+    }();
+    var Typeahead = function() {
+        "use strict";
+        var attrsKey = "ttAttrs";
+        function Typeahead(o) {
+            var $menu, $input, $hint;
+            o = o || {};
+            if (!o.input) {
+                $.error("missing input");
+            }
+            this.isActivated = false;
+            this.autoselect = !!o.autoselect;
+            this.minLength = _.isNumber(o.minLength) ? o.minLength : 1;
+            this.$node = buildDom(o.input, o.withHint);
+            $menu = this.$node.find(".tt-dropdown-menu");
+            $input = this.$node.find(".tt-input");
+            $hint = this.$node.find(".tt-hint");
+            $input.on("blur.tt", function($e) {
+                var active, isActive, hasActive;
+                active = document.activeElement;
+                isActive = $menu.is(active);
+                hasActive = $menu.has(active).length > 0;
+                if (_.isMsie() && (isActive || hasActive)) {
+                    $e.preventDefault();
+                    $e.stopImmediatePropagation();
+                    _.defer(function() {
+                        $input.focus();
+                    });
+                }
+            });
+            $menu.on("mousedown.tt", function($e) {
+                $e.preventDefault();
+            });
+            this.eventBus = o.eventBus || new EventBus({
+                el: $input
+            });
+            this.dropdown = new Dropdown({
+                menu: $menu,
+                datasets: o.datasets
+            }).onSync("suggestionClicked", this._onSuggestionClicked, this).onSync("cursorMoved", this._onCursorMoved, this).onSync("cursorRemoved", this._onCursorRemoved, this).onSync("opened", this._onOpened, this).onSync("closed", this._onClosed, this).onAsync("datasetRendered", this._onDatasetRendered, this);
+            this.input = new Input({
+                input: $input,
+                hint: $hint
+            }).onSync("focused", this._onFocused, this).onSync("blurred", this._onBlurred, this).onSync("enterKeyed", this._onEnterKeyed, this).onSync("tabKeyed", this._onTabKeyed, this).onSync("escKeyed", this._onEscKeyed, this).onSync("upKeyed", this._onUpKeyed, this).onSync("downKeyed", this._onDownKeyed, this).onSync("leftKeyed", this._onLeftKeyed, this).onSync("rightKeyed", this._onRightKeyed, this).onSync("queryChanged", this._onQueryChanged, this).onSync("whitespaceChanged", this._onWhitespaceChanged, this);
+            this._setLanguageDirection();
+        }
+        _.mixin(Typeahead.prototype, {
+            _onSuggestionClicked: function onSuggestionClicked(type, $el) {
+                var datum;
+                if (datum = this.dropdown.getDatumForSuggestion($el)) {
+                    this._select(datum);
+                }
+            },
+            _onCursorMoved: function onCursorMoved() {
+                var datum = this.dropdown.getDatumForCursor();
+                this.input.setInputValue(datum.value, true);
+                this.eventBus.trigger("cursorchanged", datum.raw, datum.datasetName);
+            },
+            _onCursorRemoved: function onCursorRemoved() {
+                this.input.resetInputValue();
+                this._updateHint();
+            },
+            _onDatasetRendered: function onDatasetRendered() {
+                this._updateHint();
+            },
+            _onOpened: function onOpened() {
+                this._updateHint();
+                this.eventBus.trigger("opened");
+            },
+            _onClosed: function onClosed() {
+                this.input.clearHint();
+                this.eventBus.trigger("closed");
+            },
+            _onFocused: function onFocused() {
+                this.isActivated = true;
+                this.dropdown.open();
+            },
+            _onBlurred: function onBlurred() {
+                this.isActivated = false;
+                this.dropdown.empty();
+                this.dropdown.close();
+            },
+            _onEnterKeyed: function onEnterKeyed(type, $e) {
+                var cursorDatum, topSuggestionDatum;
+                cursorDatum = this.dropdown.getDatumForCursor();
+                topSuggestionDatum = this.dropdown.getDatumForTopSuggestion();
+                if (cursorDatum) {
+                    this._select(cursorDatum);
+                    $e.preventDefault();
+                } else if (this.autoselect && topSuggestionDatum) {
+                    this._select(topSuggestionDatum);
+                    $e.preventDefault();
+                }
+            },
+            _onTabKeyed: function onTabKeyed(type, $e) {
+                var datum;
+                if (datum = this.dropdown.getDatumForCursor()) {
+                    this._select(datum);
+                    $e.preventDefault();
+                } else {
+                    this._autocomplete(true);
+                }
+            },
+            _onEscKeyed: function onEscKeyed() {
+                this.dropdown.close();
+                this.input.resetInputValue();
+            },
+            _onUpKeyed: function onUpKeyed() {
+                var query = this.input.getQuery();
+                this.dropdown.isEmpty && query.length >= this.minLength ? this.dropdown.update(query) : this.dropdown.moveCursorUp();
+                this.dropdown.open();
+            },
+            _onDownKeyed: function onDownKeyed() {
+                var query = this.input.getQuery();
+                this.dropdown.isEmpty && query.length >= this.minLength ? this.dropdown.update(query) : this.dropdown.moveCursorDown();
+                this.dropdown.open();
+            },
+            _onLeftKeyed: function onLeftKeyed() {
+                this.dir === "rtl" && this._autocomplete();
+            },
+            _onRightKeyed: function onRightKeyed() {
+                this.dir === "ltr" && this._autocomplete();
+            },
+            _onQueryChanged: function onQueryChanged(e, query) {
+                this.input.clearHintIfInvalid();
+                query.length >= this.minLength ? this.dropdown.update(query) : this.dropdown.empty();
+                this.dropdown.open();
+                this._setLanguageDirection();
+            },
+            _onWhitespaceChanged: function onWhitespaceChanged() {
+                this._updateHint();
+                this.dropdown.open();
+            },
+            _setLanguageDirection: function setLanguageDirection() {
+                var dir;
+                if (this.dir !== (dir = this.input.getLanguageDirection())) {
+                    this.dir = dir;
+                    this.$node.css("direction", dir);
+                    this.dropdown.setLanguageDirection(dir);
+                }
+            },
+            _updateHint: function updateHint() {
+                var datum, val, query, escapedQuery, frontMatchRegEx, match;
+                datum = this.dropdown.getDatumForTopSuggestion();
+                if (datum && this.dropdown.isVisible() && !this.input.hasOverflow()) {
+                    val = this.input.getInputValue();
+                    query = Input.normalizeQuery(val);
+                    escapedQuery = _.escapeRegExChars(query);
+                    frontMatchRegEx = new RegExp("^(?:" + escapedQuery + ")(.+$)", "i");
+                    match = frontMatchRegEx.exec(datum.value);
+                    match ? this.input.setHint(val + match[1]) : this.input.clearHint();
+                } else {
+                    this.input.clearHint();
+                }
+            },
+            _autocomplete: function autocomplete(laxCursor) {
+                var hint, query, isCursorAtEnd, datum;
+                hint = this.input.getHint();
+                query = this.input.getQuery();
+                isCursorAtEnd = laxCursor || this.input.isCursorAtEnd();
+                if (hint && query !== hint && isCursorAtEnd) {
+                    datum = this.dropdown.getDatumForTopSuggestion();
+                    datum && this.input.setInputValue(datum.value);
+                    this.eventBus.trigger("autocompleted", datum.raw, datum.datasetName);
+                }
+            },
+            _select: function select(datum) {
+                this.input.setQuery(datum.value);
+                this.input.setInputValue(datum.value, true);
+                this._setLanguageDirection();
+                this.eventBus.trigger("selected", datum.raw, datum.datasetName);
+                this.dropdown.close();
+                _.defer(_.bind(this.dropdown.empty, this.dropdown));
+            },
+            open: function open() {
+                this.dropdown.open();
+            },
+            close: function close() {
+                this.dropdown.close();
+            },
+            setVal: function setVal(val) {
+                val = _.toStr(val);
+                if (this.isActivated) {
+                    this.input.setInputValue(val);
+                } else {
+                    this.input.setQuery(val);
+                    this.input.setInputValue(val, true);
+                }
+                this._setLanguageDirection();
+            },
+            getVal: function getVal() {
+                return this.input.getQuery();
+            },
+            destroy: function destroy() {
+                this.input.destroy();
+                this.dropdown.destroy();
+                destroyDomStructure(this.$node);
+                this.$node = null;
+            }
+        });
+        return Typeahead;
+        function buildDom(input, withHint) {
+            var $input, $wrapper, $dropdown, $hint;
+            $input = $(input);
+            $wrapper = $(html.wrapper).css(css.wrapper);
+            $dropdown = $(html.dropdown).css(css.dropdown);
+            $hint = $input.clone().css(css.hint).css(getBackgroundStyles($input));
+            $hint.val("").removeData().addClass("tt-hint").removeAttr("id name placeholder required").prop("readonly", true).attr({
+                autocomplete: "off",
+                spellcheck: "false",
+                tabindex: -1
+            });
+            $input.data(attrsKey, {
+                dir: $input.attr("dir"),
+                autocomplete: $input.attr("autocomplete"),
+                spellcheck: $input.attr("spellcheck"),
+                style: $input.attr("style")
+            });
+            $input.addClass("tt-input").attr({
+                autocomplete: "off",
+                spellcheck: false
+            }).css(withHint ? css.input : css.inputWithNoHint);
+            try {
+                !$input.attr("dir") && $input.attr("dir", "auto");
+            } catch (e) {}
+            return $input.wrap($wrapper).parent().prepend(withHint ? $hint : null).append($dropdown);
+        }
+        function getBackgroundStyles($el) {
+            return {
+                backgroundAttachment: $el.css("background-attachment"),
+                backgroundClip: $el.css("background-clip"),
+                backgroundColor: $el.css("background-color"),
+                backgroundImage: $el.css("background-image"),
+                backgroundOrigin: $el.css("background-origin"),
+                backgroundPosition: $el.css("background-position"),
+                backgroundRepeat: $el.css("background-repeat"),
+                backgroundSize: $el.css("background-size")
+            };
+        }
+        function destroyDomStructure($node) {
+            var $input = $node.find(".tt-input");
+            _.each($input.data(attrsKey), function(val, key) {
+                _.isUndefined(val) ? $input.removeAttr(key) : $input.attr(key, val);
+            });
+            $input.detach().removeData(attrsKey).removeClass("tt-input").insertAfter($node);
+            $node.remove();
+        }
+    }();
+    (function() {
+        "use strict";
+        var old, typeaheadKey, methods;
+        old = $.fn.typeahead;
+        typeaheadKey = "ttTypeahead";
+        methods = {
+            initialize: function initialize(o, datasets) {
+                datasets = _.isArray(datasets) ? datasets : [].slice.call(arguments, 1);
+                o = o || {};
+                return this.each(attach);
+                function attach() {
+                    var $input = $(this), eventBus, typeahead;
+                    _.each(datasets, function(d) {
+                        d.highlight = !!o.highlight;
+                    });
+                    typeahead = new Typeahead({
+                        input: $input,
+                        eventBus: eventBus = new EventBus({
+                            el: $input
+                        }),
+                        withHint: _.isUndefined(o.hint) ? true : !!o.hint,
+                        minLength: o.minLength,
+                        autoselect: o.autoselect,
+                        datasets: datasets
+                    });
+                    $input.data(typeaheadKey, typeahead);
+                }
+            },
+            open: function open() {
+                return this.each(openTypeahead);
+                function openTypeahead() {
+                    var $input = $(this), typeahead;
+                    if (typeahead = $input.data(typeaheadKey)) {
+                        typeahead.open();
+                    }
+                }
+            },
+            close: function close() {
+                return this.each(closeTypeahead);
+                function closeTypeahead() {
+                    var $input = $(this), typeahead;
+                    if (typeahead = $input.data(typeaheadKey)) {
+                        typeahead.close();
+                    }
+                }
+            },
+            val: function val(newVal) {
+                return !arguments.length ? getVal(this.first()) : this.each(setVal);
+                function setVal() {
+                    var $input = $(this), typeahead;
+                    if (typeahead = $input.data(typeaheadKey)) {
+                        typeahead.setVal(newVal);
+                    }
+                }
+                function getVal($input) {
+                    var typeahead, query;
+                    if (typeahead = $input.data(typeaheadKey)) {
+                        query = typeahead.getVal();
+                    }
+                    return query;
+                }
+            },
+            destroy: function destroy() {
+                return this.each(unattach);
+                function unattach() {
+                    var $input = $(this), typeahead;
+                    if (typeahead = $input.data(typeaheadKey)) {
+                        typeahead.destroy();
+                        $input.removeData(typeaheadKey);
+                    }
+                }
+            }
+        };
+        $.fn.typeahead = function(method) {
+            var tts;
+            if (methods[method] && method !== "initialize") {
+                tts = this.filter(function() {
+                    return !!$(this).data(typeaheadKey);
+                });
+                return methods[method].apply(tts, [].slice.call(arguments, 1));
+            } else {
+                return methods.initialize.apply(this, arguments);
+            }
+        };
+        $.fn.typeahead.noConflict = function noConflict() {
+            $.fn.typeahead = old;
+            return this;
+        };
+    })();
+})(window.jQuery);
\ No newline at end of file
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_accordion.scss b/app/assets/stylesheets/rails_admin/bootstrap/_accordion.scss
deleted file mode 100755
index 576bdaea11..0000000000
--- a/app/assets/stylesheets/rails_admin/bootstrap/_accordion.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-//
-// Accordion
-// --------------------------------------------------
-
-
-// Parent container
-.accordion {
-  margin-bottom: $baseLineHeight;
-}
-
-// Group == heading + body
-.accordion-group {
-  margin-bottom: 2px;
-  border: 1px solid #e5e5e5;
-  @include border-radius($baseBorderRadius);
-}
-.accordion-heading {
-  border-bottom: 0;
-}
-.accordion-heading .accordion-toggle {
-  display: block;
-  padding: 8px 15px;
-}
-
-// General toggle styles
-.accordion-toggle {
-  cursor: pointer;
-}
-
-// Inner needs the styles because you can't animate properly with any styles on the element
-.accordion-inner {
-  padding: 9px 15px;
-  border-top: 1px solid #e5e5e5;
-}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_alerts.scss b/app/assets/stylesheets/rails_admin/bootstrap/_alerts.scss
old mode 100755
new mode 100644
index 65335110b1..e45de83058
--- a/app/assets/stylesheets/rails_admin/bootstrap/_alerts.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_alerts.scss
@@ -7,73 +7,62 @@
 // -------------------------
 
 .alert {
-  padding: 8px 35px 8px 14px;
-  margin-bottom: $baseLineHeight;
-  text-shadow: 0 1px 0 rgba(255,255,255,.5);
-  background-color: $warningBackground;
-  border: 1px solid $warningBorder;
-  @include border-radius($baseBorderRadius);
-}
-.alert,
-.alert h4 {
-  // Specified for the h4 to prevent conflicts of changing $headingsColor
-  color: $warningText;
-}
-.alert h4 {
-  margin: 0;
-}
+  padding: $alert-padding;
+  margin-bottom: $line-height-computed;
+  border: 1px solid transparent;
+  border-radius: $alert-border-radius;
 
-// Adjust close link position
-.alert .close {
-  position: relative;
-  top: -2px;
-  right: -21px;
-  line-height: $baseLineHeight;
+  // Headings for larger alerts
+  h4 {
+    margin-top: 0;
+    // Specified for the h4 to prevent conflicts of changing $headings-color
+    color: inherit;
+  }
+  // Provide class for links that match alerts
+  .alert-link {
+    font-weight: $alert-link-font-weight;
+  }
+
+  // Improve alignment and spacing of inner content
+  > p,
+  > ul {
+    margin-bottom: 0;
+  }
+  > p + p {
+    margin-top: 5px;
+  }
 }
 
+// Dismissible alerts
+//
+// Expand the right padding and account for the close button's positioning.
+
+.alert-dismissable, // The misspelled .alert-dismissable was deprecated in 3.2.0.
+.alert-dismissible {
+  padding-right: ($alert-padding + 20);
+
+  // Adjust close link position
+  .close {
+    position: relative;
+    top: -2px;
+    right: -21px;
+    color: inherit;
+  }
+}
 
 // Alternate styles
-// -------------------------
+//
+// Generate contextual modifier classes for colorizing the alert.
 
 .alert-success {
-  background-color: $successBackground;
-  border-color: $successBorder;
-  color: $successText;
-}
-.alert-success h4 {
-  color: $successText;
-}
-.alert-danger,
-.alert-error {
-  background-color: $errorBackground;
-  border-color: $errorBorder;
-  color: $errorText;
-}
-.alert-danger h4,
-.alert-error h4 {
-  color: $errorText;
+  @include alert-variant($alert-success-bg, $alert-success-border, $alert-success-text);
 }
 .alert-info {
-  background-color: $infoBackground;
-  border-color: $infoBorder;
-  color: $infoText;
-}
-.alert-info h4 {
-  color: $infoText;
-}
-
-
-// Block alerts
-// -------------------------
-
-.alert-block {
-  padding-top: 14px;
-  padding-bottom: 14px;
+  @include alert-variant($alert-info-bg, $alert-info-border, $alert-info-text);
 }
-.alert-block > p,
-.alert-block > ul {
-  margin-bottom: 0;
+.alert-warning {
+  @include alert-variant($alert-warning-bg, $alert-warning-border, $alert-warning-text);
 }
-.alert-block p + p {
-  margin-top: 5px;
+.alert-danger {
+  @include alert-variant($alert-danger-bg, $alert-danger-border, $alert-danger-text);
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_badges.scss b/app/assets/stylesheets/rails_admin/bootstrap/_badges.scss
new file mode 100644
index 0000000000..02394ae7fa
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_badges.scss
@@ -0,0 +1,57 @@
+//
+// Badges
+// --------------------------------------------------
+
+
+// Base class
+.badge {
+  display: inline-block;
+  min-width: 10px;
+  padding: 3px 7px;
+  font-size: $font-size-small;
+  font-weight: $badge-font-weight;
+  color: $badge-color;
+  line-height: $badge-line-height;
+  vertical-align: baseline;
+  white-space: nowrap;
+  text-align: center;
+  background-color: $badge-bg;
+  border-radius: $badge-border-radius;
+
+  // Empty badges collapse automatically (not available in IE8)
+  &:empty {
+    display: none;
+  }
+
+  // Quick fix for badges in buttons
+  .btn & {
+    position: relative;
+    top: -1px;
+  }
+  .btn-xs & {
+    top: 0;
+    padding: 1px 5px;
+  }
+
+  // [converter] extracted a& to a.badge
+
+  // Account for badges in navs
+  a.list-group-item.active > &,
+  .nav-pills > .active > a > & {
+    color: $badge-active-color;
+    background-color: $badge-active-bg;
+  }
+  .nav-pills > li > a > & {
+    margin-left: 3px;
+  }
+}
+
+// Hover state, but only for links
+a.badge {
+  &:hover,
+  &:focus {
+    color: $badge-link-hover-color;
+    text-decoration: none;
+    cursor: pointer;
+  }
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_breadcrumbs.scss b/app/assets/stylesheets/rails_admin/bootstrap/_breadcrumbs.scss
old mode 100755
new mode 100644
index cc3f327a5a..3641e333b8
--- a/app/assets/stylesheets/rails_admin/bootstrap/_breadcrumbs.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_breadcrumbs.scss
@@ -4,21 +4,23 @@
 
 
 .breadcrumb {
-  padding: 8px 15px;
-  margin: 0 0 $baseLineHeight;
+  padding: $breadcrumb-padding-vertical $breadcrumb-padding-horizontal;
+  margin-bottom: $line-height-computed;
   list-style: none;
-  background-color: #f5f5f5;
-  @include border-radius($baseBorderRadius);
+  background-color: $breadcrumb-bg;
+  border-radius: $border-radius-base;
+
   > li {
     display: inline-block;
-    @include ie7-inline-block();
-    text-shadow: 0 1px 0 $white;
-    > .divider {
+
+    + li:before {
+      content: "#{$breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
       padding: 0 5px;
-      color: #ccc;
+      color: $breadcrumb-color;
     }
   }
-  .active {
-    color: $grayLight;
+
+  > .active {
+    color: $breadcrumb-active-color;
   }
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_button-groups.scss b/app/assets/stylesheets/rails_admin/bootstrap/_button-groups.scss
old mode 100755
new mode 100644
index 1b08d50f5e..63ccd927c8
--- a/app/assets/stylesheets/rails_admin/bootstrap/_button-groups.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_button-groups.scss
@@ -2,90 +2,87 @@
 // Button groups
 // --------------------------------------------------
 
-
 // Make the div behave like a button
-.btn-group {
+.btn-group,
+.btn-group-vertical {
   position: relative;
   display: inline-block;
-  @include ie7-inline-block();
-  font-size: 0; // remove as part 1 of font-size inline-block hack
   vertical-align: middle; // match .btn alignment given font-size hack above
-  white-space: nowrap; // prevent buttons from wrapping when in tight spaces (e.g., the table on the tests page)
-  @include ie7-restore-left-whitespace();
+  > .btn {
+    position: relative;
+    float: left;
+    // Bring the "active" button to the front
+    &:hover,
+    &:focus,
+    &:active,
+    &.active {
+      z-index: 2;
+    }
+    &:focus {
+      // Remove focus outline when dropdown JS adds it after closing the menu
+      outline: 0;
+    }
+  }
 }
 
-// Space out series of button groups
-.btn-group + .btn-group {
-  margin-left: 5px;
+// Prevent double borders when buttons are next to each other
+.btn-group {
+  .btn + .btn,
+  .btn + .btn-group,
+  .btn-group + .btn,
+  .btn-group + .btn-group {
+    margin-left: -1px;
+  }
 }
 
 // Optional: Group multiple button groups together for a toolbar
 .btn-toolbar {
-  font-size: 0; // Hack to remove whitespace that results from using inline-block
-  margin-top: $baseLineHeight / 2;
-  margin-bottom: $baseLineHeight / 2;
-  > .btn + .btn,
-  > .btn-group + .btn,
-  > .btn + .btn-group {
+  margin-left: -5px; // Offset the first child's margin
+  @include clearfix();
+
+  .btn-group,
+  .input-group {
+    float: left;
+  }
+  > .btn,
+  > .btn-group,
+  > .input-group {
     margin-left: 5px;
   }
 }
 
-// Float them, remove border radius, then re-add to first and last elements
-.btn-group > .btn {
-  position: relative;
-  @include border-radius(0);
-}
-.btn-group > .btn + .btn {
-  margin-left: -1px;
-}
-.btn-group > .btn,
-.btn-group > .dropdown-menu,
-.btn-group > .popover {
-  font-size: $baseFontSize; // redeclare as part 2 of font-size inline-block hack
-}
-
-// Reset fonts for other sizes
-.btn-group > .btn-mini {
-  font-size: $fontSizeMini;
-}
-.btn-group > .btn-small {
-  font-size: $fontSizeSmall;
-}
-.btn-group > .btn-large {
-  font-size: $fontSizeLarge;
+.btn-group > .btn:not(:first-child):not(:last-child):not(.dropdown-toggle) {
+  border-radius: 0;
 }
 
 // Set corners individual because sometimes a single button can be in a .btn-group and we need :first-child and :last-child to both match
 .btn-group > .btn:first-child {
   margin-left: 0;
-  @include border-top-left-radius($baseBorderRadius);
-  @include border-bottom-left-radius($baseBorderRadius);
+  &:not(:last-child):not(.dropdown-toggle) {
+    @include border-right-radius(0);
+  }
 }
 // Need .dropdown-toggle since :last-child doesn't apply given a .dropdown-menu immediately after it
-.btn-group > .btn:last-child,
-.btn-group > .dropdown-toggle {
-  @include border-top-right-radius($baseBorderRadius);
-  @include border-bottom-right-radius($baseBorderRadius);
+.btn-group > .btn:last-child:not(:first-child),
+.btn-group > .dropdown-toggle:not(:first-child) {
+  @include border-left-radius(0);
 }
-// Reset corners for large buttons
-.btn-group > .btn.large:first-child {
-  margin-left: 0;
-  @include border-top-left-radius($borderRadiusLarge);
-  @include border-bottom-left-radius($borderRadiusLarge);
+
+// Custom edits for including btn-groups within btn-groups (useful for including dropdown buttons within a btn-group)
+.btn-group > .btn-group {
+  float: left;
 }
-.btn-group > .btn.large:last-child,
-.btn-group > .large.dropdown-toggle {
-  @include border-top-right-radius($borderRadiusLarge);
-  @include border-bottom-right-radius($borderRadiusLarge);
+.btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
+  border-radius: 0;
 }
-
-// On hover/focus/active, bring the proper btn to front
-.btn-group > .btn:hover,
-.btn-group > .btn:focus,
-.btn-group > .btn:active,
-.btn-group > .btn.active {
-  z-index: 2;
+.btn-group > .btn-group:first-child {
+  > .btn:last-child,
+  > .dropdown-toggle {
+    @include border-right-radius(0);
+  }
+}
+.btn-group > .btn-group:last-child > .btn:first-child {
+  @include border-left-radius(0);
 }
 
 // On active and open, don't show outline
@@ -95,6 +92,14 @@
 }
 
 
+// Sizing
+//
+// Remix the default button sizing classes into new ones for easier manipulation.
+
+.btn-group-xs > .btn { @extend .btn-xs; }
+.btn-group-sm > .btn { @extend .btn-sm; }
+.btn-group-lg > .btn { @extend .btn-lg; }
+
 
 // Split button dropdowns
 // ----------------------
@@ -103,127 +108,133 @@
 .btn-group > .btn + .dropdown-toggle {
   padding-left: 8px;
   padding-right: 8px;
-  @include box-shadow(inset 1px 0 0 rgba(255,255,255,.125), inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05));
-  *padding-top: 5px;
-  *padding-bottom: 5px;
-}
-.btn-group > .btn-mini + .dropdown-toggle {
-  padding-left: 5px;
-  padding-right: 5px;
-  *padding-top: 2px;
-  *padding-bottom: 2px;
 }
-.btn-group > .btn-small + .dropdown-toggle {
-  *padding-top: 5px;
-  *padding-bottom: 4px;
-}
-.btn-group > .btn-large + .dropdown-toggle {
+.btn-group > .btn-lg + .dropdown-toggle {
   padding-left: 12px;
   padding-right: 12px;
-  *padding-top: 7px;
-  *padding-bottom: 7px;
 }
 
-.btn-group.open {
-
-  // The clickable button for toggling the menu
-  // Remove the gradient and set the same inset shadow as the :active state
-  .dropdown-toggle {
-    background-image: none;
-    @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05));
-  }
+// The clickable button for toggling the menu
+// Remove the gradient and set the same inset shadow as the :active state
+.btn-group.open .dropdown-toggle {
+  @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
 
-  // Keep the hover's background when dropdown is open
-  .btn.dropdown-toggle {
-    background-color: $btnBackgroundHighlight;
-  }
-  .btn-primary.dropdown-toggle {
-    background-color: $btnPrimaryBackgroundHighlight;
-  }
-  .btn-warning.dropdown-toggle {
-    background-color: $btnWarningBackgroundHighlight;
-  }
-  .btn-danger.dropdown-toggle {
-    background-color: $btnDangerBackgroundHighlight;
-  }
-  .btn-success.dropdown-toggle {
-    background-color: $btnSuccessBackgroundHighlight;
-  }
-  .btn-info.dropdown-toggle {
-    background-color: $btnInfoBackgroundHighlight;
-  }
-  .btn-inverse.dropdown-toggle {
-    background-color: $btnInverseBackgroundHighlight;
+  // Show no shadow for `.btn-link` since it has no other button styles.
+  &.btn-link {
+    @include box-shadow(none);
   }
 }
 
 
 // Reposition the caret
 .btn .caret {
-  margin-top: 8px;
   margin-left: 0;
 }
 // Carets in other button sizes
-.btn-large .caret {
-  margin-top: 6px;
-}
-.btn-large .caret {
-  border-left-width:  5px;
-  border-right-width: 5px;
-  border-top-width:   5px;
-}
-.btn-mini .caret,
-.btn-small .caret {
-  margin-top: 8px;
+.btn-lg .caret {
+  border-width: $caret-width-large $caret-width-large 0;
+  border-bottom-width: 0;
 }
 // Upside down carets for .dropup
-.dropup .btn-large .caret {
-  border-bottom-width: 5px;
+.dropup .btn-lg .caret {
+  border-width: 0 $caret-width-large $caret-width-large;
 }
 
 
-
-// Account for other colors
-.btn-primary,
-.btn-warning,
-.btn-danger,
-.btn-info,
-.btn-success,
-.btn-inverse {
-  .caret {
-    border-top-color: $white;
-    border-bottom-color: $white;
-  }
-}
-
-
-
 // Vertical button groups
 // ----------------------
 
 .btn-group-vertical {
-  display: inline-block; // makes buttons only take up the width they need
-  @include ie7-inline-block();
+  > .btn,
+  > .btn-group,
+  > .btn-group > .btn {
+    display: block;
+    float: none;
+    width: 100%;
+    max-width: 100%;
+  }
+
+  // Clear floats so dropdown menus can be properly placed
+  > .btn-group {
+    @include clearfix();
+    > .btn {
+      float: none;
+    }
+  }
+
+  > .btn + .btn,
+  > .btn + .btn-group,
+  > .btn-group + .btn,
+  > .btn-group + .btn-group {
+    margin-top: -1px;
+    margin-left: 0;
+  }
 }
+
 .btn-group-vertical > .btn {
-  display: block;
-  float: none;
-  max-width: 100%;
-  @include border-radius(0);
+  &:not(:first-child):not(:last-child) {
+    border-radius: 0;
+  }
+  &:first-child:not(:last-child) {
+    border-top-right-radius: $border-radius-base;
+    @include border-bottom-radius(0);
+  }
+  &:last-child:not(:first-child) {
+    border-bottom-left-radius: $border-radius-base;
+    @include border-top-radius(0);
+  }
 }
-.btn-group-vertical > .btn + .btn {
-  margin-left: 0;
-  margin-top: -1px;
+.btn-group-vertical > .btn-group:not(:first-child):not(:last-child) > .btn {
+  border-radius: 0;
 }
-.btn-group-vertical > .btn:first-child {
-  @include border-radius($baseBorderRadius $baseBorderRadius 0 0);
+.btn-group-vertical > .btn-group:first-child:not(:last-child) {
+  > .btn:last-child,
+  > .dropdown-toggle {
+    @include border-bottom-radius(0);
+  }
 }
-.btn-group-vertical > .btn:last-child {
-  @include border-radius(0 0 $baseBorderRadius $baseBorderRadius);
+.btn-group-vertical > .btn-group:last-child:not(:first-child) > .btn:first-child {
+  @include border-top-radius(0);
 }
-.btn-group-vertical > .btn-large:first-child {
-  @include border-radius($borderRadiusLarge $borderRadiusLarge 0 0);
+
+
+
+// Justified button groups
+// ----------------------
+
+.btn-group-justified {
+  display: table;
+  width: 100%;
+  table-layout: fixed;
+  border-collapse: separate;
+  > .btn,
+  > .btn-group {
+    float: none;
+    display: table-cell;
+    width: 1%;
+  }
+  > .btn-group .btn {
+    width: 100%;
+  }
+
+  > .btn-group .dropdown-menu {
+    left: auto;
+  }
 }
-.btn-group-vertical > .btn-large:last-child {
-  @include border-radius(0 0 $borderRadiusLarge $borderRadiusLarge);
+
+
+// Checkbox and radio options
+//
+// In order to support the browser's form validation feedback, powered by the
+// `required` attribute, we have to "hide" the inputs via `opacity`. We cannot
+// use `display: none;` or `visibility: hidden;` as that also hides the popover.
+// This way, we ensure a DOM element is visible to position the popover from.
+//
+// See https://github.com/twbs/bootstrap/pull/12794 for more.
+
+[data-toggle="buttons"] > .btn > input[type="radio"],
+[data-toggle="buttons"] > .btn > input[type="checkbox"] {
+  position: absolute;
+  z-index: -1;
+  @include opacity(0);
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_buttons.scss b/app/assets/stylesheets/rails_admin/bootstrap/_buttons.scss
old mode 100755
new mode 100644
index a92268b5fa..dae6ee3767
--- a/app/assets/stylesheets/rails_admin/bootstrap/_buttons.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_buttons.scss
@@ -6,109 +6,140 @@
 // Base styles
 // --------------------------------------------------
 
-// Core
 .btn {
   display: inline-block;
-  @include ie7-inline-block();
-  padding: 4px 12px;
   margin-bottom: 0; // For input.btn
-  font-size: $baseFontSize;
-  line-height: $baseLineHeight;
+  font-weight: $btn-font-weight;
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
-  @include buttonBackground($btnBackground, $btnBackgroundHighlight, $grayDark, 0 1px 1px rgba(255,255,255,.75));
-  border: 1px solid $btnBorder;
-  *border: 0; // Remove the border to prevent IE7's black border on input:focus
-  border-bottom-color: darken($btnBorder, 10%);
-  @include border-radius($baseBorderRadius);
-  @include ie7-restore-left-whitespace(); // Give IE7 some love
-  @include box-shadow(inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05));
-
-  // Hover/focus state
-  &:hover,
-  &:focus {
-    color: $grayDark;
-    text-decoration: none;
-    background-position: 0 -15px;
-
-    // transition is only when going to hover/focus, otherwise the background
-    // behind the gradient (there for IE<=9 fallback) gets mismatched
-    @include transition(background-position .1s linear);
+  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
+  border: 1px solid transparent;
+  white-space: nowrap;
+  @include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $border-radius-base);
+  @include user-select(none);
+
+  &,
+  &:active,
+  &.active {
+    &:focus {
+      @include tab-focus();
+    }
   }
 
-  // Focus state for keyboard and accessibility
+  &:hover,
   &:focus {
-    @include tab-focus();
+    color: $btn-default-color;
+    text-decoration: none;
   }
 
-  // Active state
-  &.active,
-  &:active {
-    background-image: none;
+  &:active,
+  &.active {
     outline: 0;
-    @include box-shadow(inset 0 2px 4px rgba(0,0,0,.15), 0 1px 2px rgba(0,0,0,.05));
+    background-image: none;
+    @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
   }
 
-  // Disabled state
   &.disabled,
-  &[disabled] {
-    cursor: default;
-    background-image: none;
-    @include opacity(65);
+  &[disabled],
+  fieldset[disabled] & {
+    cursor: not-allowed;
+    pointer-events: none; // Future-proof disabling of clicks
+    @include opacity(.65);
     @include box-shadow(none);
   }
-
 }
 
 
-
-// Button Sizes
+// Alternate buttons
 // --------------------------------------------------
 
-// Large
-.btn-large {
-  padding: $paddingLarge;
-  font-size: $fontSizeLarge;
-  @include border-radius($borderRadiusLarge);
+.btn-default {
+  @include button-variant($btn-default-color, $btn-default-bg, $btn-default-border);
 }
-.btn-large [class^="icon-"],
-.btn-large [class*=" icon-"] {
-  margin-top: 4px;
+.btn-primary {
+  @include button-variant($btn-primary-color, $btn-primary-bg, $btn-primary-border);
 }
-
-// Small
-.btn-small {
-  padding: $paddingSmall;
-  font-size: $fontSizeSmall;
-  @include border-radius($borderRadiusSmall);
+// Success appears as green
+.btn-success {
+  @include button-variant($btn-success-color, $btn-success-bg, $btn-success-border);
 }
-.btn-small [class^="icon-"],
-.btn-small [class*=" icon-"] {
-  margin-top: 0;
+// Info appears as blue-green
+.btn-info {
+  @include button-variant($btn-info-color, $btn-info-bg, $btn-info-border);
+}
+// Warning appears as orange
+.btn-warning {
+  @include button-variant($btn-warning-color, $btn-warning-bg, $btn-warning-border);
+}
+// Danger and error appear as red
+.btn-danger {
+  @include button-variant($btn-danger-color, $btn-danger-bg, $btn-danger-border);
 }
-.btn-mini [class^="icon-"],
-.btn-mini [class*=" icon-"] {
-  margin-top: -1px;
+
+
+// Link buttons
+// -------------------------
+
+// Make a button look and behave like a link
+.btn-link {
+  color: $link-color;
+  font-weight: normal;
+  cursor: pointer;
+  border-radius: 0;
+
+  &,
+  &:active,
+  &[disabled],
+  fieldset[disabled] & {
+    background-color: transparent;
+    @include box-shadow(none);
+  }
+  &,
+  &:hover,
+  &:focus,
+  &:active {
+    border-color: transparent;
+  }
+  &:hover,
+  &:focus {
+    color: $link-hover-color;
+    text-decoration: underline;
+    background-color: transparent;
+  }
+  &[disabled],
+  fieldset[disabled] & {
+    &:hover,
+    &:focus {
+      color: $btn-link-disabled-color;
+      text-decoration: none;
+    }
+  }
 }
 
-// Mini
-.btn-mini {
-  padding: $paddingMini;
-  font-size: $fontSizeMini;
-  @include border-radius($borderRadiusSmall);
+
+// Button Sizes
+// --------------------------------------------------
+
+.btn-lg {
+  // line-height: ensure even-numbered height of button next to large input
+  @include button-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
+}
+.btn-sm {
+  // line-height: ensure proper height of button next to small input
+  @include button-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
+}
+.btn-xs {
+  @include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-small, $line-height-small, $border-radius-small);
 }
 
 
 // Block button
-// -------------------------
+// --------------------------------------------------
 
 .btn-block {
   display: block;
   width: 100%;
-  padding-left: 0;
-  padding-right: 0;
-  @include box-sizing(border-box);
 }
 
 // Vertically space out multiple block buttons
@@ -124,105 +155,3 @@ input[type="button"] {
     width: 100%;
   }
 }
-
-
-
-// Alternate buttons
-// --------------------------------------------------
-
-// Provide *some* extra contrast for those who can get it
-.btn-primary.active,
-.btn-warning.active,
-.btn-danger.active,
-.btn-success.active,
-.btn-info.active,
-.btn-inverse.active {
-  color: rgba(255,255,255,.75);
-}
-
-// Set the backgrounds
-// -------------------------
-.btn-primary {
-  @include buttonBackground($btnPrimaryBackground, $btnPrimaryBackgroundHighlight);
-}
-// Warning appears are orange
-.btn-warning {
-  @include buttonBackground($btnWarningBackground, $btnWarningBackgroundHighlight);
-}
-// Danger and error appear as red
-.btn-danger {
-  @include buttonBackground($btnDangerBackground, $btnDangerBackgroundHighlight);
-}
-// Success appears as green
-.btn-success {
-  @include buttonBackground($btnSuccessBackground, $btnSuccessBackgroundHighlight);
-}
-// Info appears as a neutral blue
-.btn-info {
-  @include buttonBackground($btnInfoBackground, $btnInfoBackgroundHighlight);
-}
-// Inverse appears as dark gray
-.btn-inverse {
-  @include buttonBackground($btnInverseBackground, $btnInverseBackgroundHighlight);
-}
-
-
-// Cross-browser Jank
-// --------------------------------------------------
-
-button.btn,
-input[type="submit"].btn {
-
-  // Firefox 3.6 only I believe
-  &::-moz-focus-inner {
-    padding: 0;
-    border: 0;
-  }
-
-  // IE7 has some default padding on button controls
-  *padding-top: 3px;
-  *padding-bottom: 3px;
-
-  &.btn-large {
-    *padding-top: 7px;
-    *padding-bottom: 7px;
-  }
-  &.btn-small {
-    *padding-top: 3px;
-    *padding-bottom: 3px;
-  }
-  &.btn-mini {
-    *padding-top: 1px;
-    *padding-bottom: 1px;
-  }
-}
-
-
-// Link buttons
-// --------------------------------------------------
-
-// Make a button look and behave like a link
-.btn-link,
-.btn-link:active,
-.btn-link[disabled] {
-  background-color: transparent;
-  background-image: none;
-  @include box-shadow(none);
-}
-.btn-link {
-  border-color: transparent;
-  cursor: pointer;
-  color: $linkColor;
-  @include border-radius(0);
-}
-.btn-link:hover,
-.btn-link:focus {
-  color: $linkColorHover;
-  text-decoration: underline;
-  background-color: transparent;
-}
-.btn-link[disabled]:hover,
-.btn-link[disabled]:focus {
-  color: $grayDark;
-  text-decoration: none;
-}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_carousel.scss b/app/assets/stylesheets/rails_admin/bootstrap/_carousel.scss
old mode 100755
new mode 100644
index 22eaddb904..e9e2f7ce1e
--- a/app/assets/stylesheets/rails_admin/bootstrap/_carousel.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_carousel.scss
@@ -3,36 +3,34 @@
 // --------------------------------------------------
 
 
+// Wrapper for the slide container and indicators
 .carousel {
   position: relative;
-  margin-bottom: $baseLineHeight;
-  line-height: 1;
 }
 
 .carousel-inner {
+  position: relative;
   overflow: hidden;
   width: 100%;
-  position: relative;
-}
-
-.carousel-inner {
 
   > .item {
     display: none;
     position: relative;
     @include transition(.6s ease-in-out left);
 
-  // Account for jankitude on images
+    // Account for jankitude on images
     > img,
     > a > img {
-      display: block;
+      @include img-responsive();
       line-height: 1;
     }
   }
 
   > .active,
   > .next,
-  > .prev { display: block; }
+  > .prev {
+    display: block;
+  }
 
   > .active {
     left: 0;
@@ -70,89 +68,176 @@
 
 .carousel-control {
   position: absolute;
-  top: 40%;
-  left: 15px;
-  width: 40px;
-  height: 40px;
-  margin-top: -20px;
-  font-size: 60px;
-  font-weight: 100;
-  line-height: 30px;
-  color: $white;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  width: $carousel-control-width;
+  @include opacity($carousel-control-opacity);
+  font-size: $carousel-control-font-size;
+  color: $carousel-control-color;
   text-align: center;
-  background: $grayDarker;
-  border: 3px solid $white;
-  @include border-radius(23px);
-  @include opacity(50);
-
-  // we can't have this transition here
-  // because webkit cancels the carousel
-  // animation if you trip this while
-  // in the middle of another animation
-  // ;_;
-  // .transition(opacity .2s linear);
-
-  // Reposition the right one
+  text-shadow: $carousel-text-shadow;
+  // We can't have this transition here because WebKit cancels the carousel
+  // animation if you trip this while in the middle of another animation.
+
+  // Set gradients for backgrounds
+  &.left {
+    @include gradient-horizontal($start-color: rgba(0,0,0,.5), $end-color: rgba(0,0,0,.0001));
+  }
   &.right {
     left: auto;
-    right: 15px;
+    right: 0;
+    @include gradient-horizontal($start-color: rgba(0,0,0,.0001), $end-color: rgba(0,0,0,.5));
   }
 
   // Hover/focus state
   &:hover,
   &:focus {
-    color: $white;
+    outline: 0;
+    color: $carousel-control-color;
     text-decoration: none;
-    @include opacity(90);
+    @include opacity(.9);
+  }
+
+  // Toggles
+  .icon-prev,
+  .icon-next,
+  .glyphicon-chevron-left,
+  .glyphicon-chevron-right {
+    position: absolute;
+    top: 50%;
+    z-index: 5;
+    display: inline-block;
+  }
+  .icon-prev,
+  .glyphicon-chevron-left {
+    left: 50%;
+    margin-left: -10px;
+  }
+  .icon-next,
+  .glyphicon-chevron-right {
+    right: 50%;
+    margin-right: -10px;
+  }
+  .icon-prev,
+  .icon-next {
+    width:  20px;
+    height: 20px;
+    margin-top: -10px;
+    font-family: serif;
+  }
+
+
+  .icon-prev {
+    &:before {
+      content: '\2039';// SINGLE LEFT-POINTING ANGLE QUOTATION MARK (U+2039)
+    }
+  }
+  .icon-next {
+    &:before {
+      content: '\203a';// SINGLE RIGHT-POINTING ANGLE QUOTATION MARK (U+203A)
+    }
   }
 }
 
-// Carousel indicator pips
-// -----------------------------
+// Optional indicator pips
+//
+// Add an unordered list with the following class and add a list item for each
+// slide your carousel holds.
+
 .carousel-indicators {
   position: absolute;
-  top: 15px;
-  right: 15px;
-  z-index: 5;
-  margin: 0;
+  bottom: 10px;
+  left: 50%;
+  z-index: 15;
+  width: 60%;
+  margin-left: -30%;
+  padding-left: 0;
   list-style: none;
+  text-align: center;
 
   li {
-    display: block;
-    float: left;
-    width: 10px;
+    display: inline-block;
+    width:  10px;
     height: 10px;
-    margin-left: 5px;
+    margin: 1px;
     text-indent: -999px;
-    background-color: #ccc;
-    background-color: rgba(255,255,255,.25);
-    border-radius: 5px;
+    border: 1px solid $carousel-indicator-border-color;
+    border-radius: 10px;
+    cursor: pointer;
+
+    // IE8-9 hack for event handling
+    //
+    // Internet Explorer 8-9 does not support clicks on elements without a set
+    // `background-color`. We cannot use `filter` since that's not viewed as a
+    // background color by the browser. Thus, a hack is needed.
+    //
+    // For IE8, we set solid black as it doesn't support `rgba()`. For IE9, we
+    // set alpha transparency for the best results possible.
+    background-color: #000 \9; // IE8
+    background-color: rgba(0,0,0,0); // IE9
   }
   .active {
-    background-color: #fff;
+    margin: 0;
+    width:  12px;
+    height: 12px;
+    background-color: $carousel-indicator-active-bg;
   }
 }
 
-// Caption for text below images
+// Optional captions
 // -----------------------------
-
+// Hidden by default for smaller viewports
 .carousel-caption {
   position: absolute;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  padding: 15px;
-  background: $grayDark;
-  background: rgba(0,0,0,.75);
-}
-.carousel-caption h4,
-.carousel-caption p {
-  color: $white;
-  line-height: $baseLineHeight;
-}
-.carousel-caption h4 {
-  margin: 0 0 5px;
+  left: 15%;
+  right: 15%;
+  bottom: 20px;
+  z-index: 10;
+  padding-top: 20px;
+  padding-bottom: 20px;
+  color: $carousel-caption-color;
+  text-align: center;
+  text-shadow: $carousel-text-shadow;
+  & .btn {
+    text-shadow: none; // No shadow for button elements in carousel-caption
+  }
 }
-.carousel-caption p {
-  margin-bottom: 0;
+
+
+// Scale up controls for tablets and up
+@media screen and (min-width: $screen-sm-min) {
+
+  // Scale up the controls a smidge
+  .carousel-control {
+    .glyphicon-chevron-left,
+    .glyphicon-chevron-right,
+    .icon-prev,
+    .icon-next {
+      width: 30px;
+      height: 30px;
+      margin-top: -15px;
+      font-size: 30px;
+    }
+    .glyphicon-chevron-left,
+    .icon-prev {
+      margin-left: -15px;
+    }
+    .glyphicon-chevron-right,
+    .icon-next {
+      margin-right: -15px;
+    }
+  }
+
+  // Show and left align the captions
+  .carousel-caption {
+    left: 20%;
+    right: 20%;
+    padding-bottom: 30px;
+  }
+
+  // Move up the indicators
+  .carousel-indicators {
+    bottom: 20px;
+  }
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_close.scss b/app/assets/stylesheets/rails_admin/bootstrap/_close.scss
old mode 100755
new mode 100644
index ee14a6ba95..62ce30fa37
--- a/app/assets/stylesheets/rails_admin/bootstrap/_close.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_close.scss
@@ -5,19 +5,22 @@
 
 .close {
   float: right;
-  font-size: 20px;
-  font-weight: bold;
-  line-height: $baseLineHeight;
-  color: $black;
-  text-shadow: 0 1px 0 rgba(255,255,255,1);
-  @include opacity(20);
+  font-size: ($font-size-base * 1.5);
+  font-weight: $close-font-weight;
+  line-height: 1;
+  color: $close-color;
+  text-shadow: $close-text-shadow;
+  @include opacity(.2);
+
   &:hover,
   &:focus {
-    color: $black;
+    color: $close-color;
     text-decoration: none;
     cursor: pointer;
-    @include opacity(40);
+    @include opacity(.5);
   }
+
+  // [converter] extracted button& to button.close
 }
 
 // Additional properties for button version
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_code.scss b/app/assets/stylesheets/rails_admin/bootstrap/_code.scss
old mode 100755
new mode 100644
index b9e2f6f224..8d83b14d79
--- a/app/assets/stylesheets/rails_admin/bootstrap/_code.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_code.scss
@@ -1,61 +1,68 @@
 //
-// Code (inline and blocK)
+// Code (inline and block)
 // --------------------------------------------------
 
 
 // Inline and block code styles
 code,
-pre {
-  padding: 0 3px 2px;
-  @include font-family-monospace;
-  font-size: $baseFontSize - 2;
-  color: $grayDark;
-  @include border-radius(3px);
+kbd,
+pre,
+samp {
+  font-family: $font-family-monospace;
 }
 
 // Inline code
 code {
   padding: 2px 4px;
-  color: #d14;
-  background-color: #f7f7f9;
-  border: 1px solid #e1e1e8;
-  white-space: nowrap;
+  font-size: 90%;
+  color: $code-color;
+  background-color: $code-bg;
+  border-radius: $border-radius-base;
+}
+
+// User input typically entered via keyboard
+kbd {
+  padding: 2px 4px;
+  font-size: 90%;
+  color: $kbd-color;
+  background-color: $kbd-bg;
+  border-radius: $border-radius-small;
+  box-shadow: inset 0 -1px 0 rgba(0,0,0,.25);
+
+  kbd {
+    padding: 0;
+    font-size: 100%;
+    box-shadow: none;
+  }
 }
 
 // Blocks of code
 pre {
   display: block;
-  padding: ($baseLineHeight - 1) / 2;
-  margin: 0 0 $baseLineHeight / 2;
-  font-size: $baseFontSize - 1; // 14px to 13px
-  line-height: $baseLineHeight;
+  padding: (($line-height-computed - 1) / 2);
+  margin: 0 0 ($line-height-computed / 2);
+  font-size: ($font-size-base - 1); // 14px to 13px
+  line-height: $line-height-base;
   word-break: break-all;
   word-wrap: break-word;
-  white-space: pre;
-  white-space: pre-wrap;
-  background-color: #f5f5f5;
-  border: 1px solid #ccc; // fallback for IE7-8
-  border: 1px solid rgba(0,0,0,.15);
-  @include border-radius($baseBorderRadius);
-
-  // Make prettyprint styles more spaced out for readability
-  &.prettyprint {
-    margin-bottom: $baseLineHeight;
-  }
+  color: $pre-color;
+  background-color: $pre-bg;
+  border: 1px solid $pre-border-color;
+  border-radius: $border-radius-base;
 
   // Account for some code outputs that place code tags in pre tags
   code {
     padding: 0;
+    font-size: inherit;
     color: inherit;
-    white-space: pre;
     white-space: pre-wrap;
     background-color: transparent;
-    border: 0;
+    border-radius: 0;
   }
 }
 
 // Enable scrollable blocks of code
 .pre-scrollable {
-  max-height: 340px;
+  max-height: $pre-scrollable-max-height;
   overflow-y: scroll;
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_component-animations.scss b/app/assets/stylesheets/rails_admin/bootstrap/_component-animations.scss
old mode 100755
new mode 100644
index 5ef86b097f..8c3fd07a27
--- a/app/assets/stylesheets/rails_admin/bootstrap/_component-animations.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_component-animations.scss
@@ -2,6 +2,10 @@
 // Component animations
 // --------------------------------------------------
 
+// Heads up!
+//
+// We don't use the `.opacity()` mixin here since it causes a bug with text
+// fields in IE7-8. Source: https://github.com/twbs/bootstrap/pull/3552.
 
 .fade {
   opacity: 0;
@@ -12,11 +16,20 @@
 }
 
 .collapse {
+  display: none;
+
+  &.in      { display: block; }
+  // [converter] extracted tr&.in to tr.collapse.in
+  // [converter] extracted tbody&.in to tbody.collapse.in
+}
+
+tr.collapse.in    { display: table-row; }
+
+tbody.collapse.in { display: table-row-group; }
+
+.collapsing {
   position: relative;
   height: 0;
   overflow: hidden;
   @include transition(height .35s ease);
-  &.in {
-    height: auto;
-  }
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_dropdowns.scss b/app/assets/stylesheets/rails_admin/bootstrap/_dropdowns.scss
old mode 100755
new mode 100644
index f5949fa018..eb74be57bd
--- a/app/assets/stylesheets/rails_admin/bootstrap/_dropdowns.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_dropdowns.scss
@@ -3,64 +3,52 @@
 // --------------------------------------------------
 
 
-// Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns
-.dropup,
-.dropdown {
-  position: relative;
-}
-.dropdown-toggle {
-  // The caret makes the toggle a bit too tall in IE7
-  *margin-bottom: -3px;
-}
-.dropdown-toggle:active,
-.open .dropdown-toggle {
-  outline: 0;
-}
-
 // Dropdown arrow/caret
-// --------------------
 .caret {
   display: inline-block;
   width: 0;
   height: 0;
-  vertical-align: top;
-  border-top:   4px solid $black;
-  border-right: 4px solid transparent;
-  border-left:  4px solid transparent;
-  content: "";
+  margin-left: 2px;
+  vertical-align: middle;
+  border-top:   $caret-width-base solid;
+  border-right: $caret-width-base solid transparent;
+  border-left:  $caret-width-base solid transparent;
 }
 
-// Place the caret
-.dropdown .caret {
-  margin-top: 8px;
-  margin-left: 2px;
+// The dropdown wrapper (div)
+.dropdown {
+  position: relative;
+}
+
+// Prevent the focus on the dropdown toggle when closing dropdowns
+.dropdown-toggle:focus {
+  outline: 0;
 }
 
 // The dropdown menu (ul)
-// ----------------------
 .dropdown-menu {
   position: absolute;
   top: 100%;
   left: 0;
-  z-index: $zindexDropdown;
+  z-index: $zindex-dropdown;
   display: none; // none by default, but block on "open" of the menu
   float: left;
   min-width: 160px;
   padding: 5px 0;
   margin: 2px 0 0; // override default ul
   list-style: none;
-  background-color: $dropdownBackground;
-  border: 1px solid #ccc; // Fallback for IE7-8
-  border: 1px solid $dropdownBorder;
-  *border-right-width: 2px;
-  *border-bottom-width: 2px;
-  @include border-radius(6px);
-  @include box-shadow(0 5px 10px rgba(0,0,0,.2));
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
+  font-size: $font-size-base;
+  text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)
+  background-color: $dropdown-bg;
+  border: 1px solid $dropdown-fallback-border; // IE8 fallback
+  border: 1px solid $dropdown-border;
+  border-radius: $border-radius-base;
+  @include box-shadow(0 6px 12px rgba(0,0,0,.175));
+  background-clip: padding-box;
 
   // Aligns the dropdown menu to right
+  //
+  // Deprecated as of 3.1.0 in favor of `.dropdown-menu-[dir]`
   &.pull-right {
     right: 0;
     left: auto;
@@ -68,7 +56,7 @@
 
   // Dividers (basically an hr) within the dropdown
   .divider {
-    @include nav-divider($dropdownDividerTop, $dropdownDividerBottom);
+    @include nav-divider($dropdown-divider-bg);
   }
 
   // Links within the dropdown menu
@@ -77,92 +65,126 @@
     padding: 3px 20px;
     clear: both;
     font-weight: normal;
-    line-height: $baseLineHeight;
-    color: $dropdownLinkColor;
-    white-space: nowrap;
+    line-height: $line-height-base;
+    color: $dropdown-link-color;
+    white-space: nowrap; // prevent links from randomly breaking onto new lines
   }
 }
 
 // Hover/Focus state
-// -----------
-.dropdown-menu > li > a:hover,
-.dropdown-menu > li > a:focus,
-.dropdown-submenu:hover > a,
-.dropdown-submenu:focus > a {
-  text-decoration: none;
-  color: $dropdownLinkColorHover;
-  @include gradient-vertical($dropdownLinkBackgroundHover, darken($dropdownLinkBackgroundHover, 5%));
+.dropdown-menu > li > a {
+  &:hover,
+  &:focus {
+    text-decoration: none;
+    color: $dropdown-link-hover-color;
+    background-color: $dropdown-link-hover-bg;
+  }
 }
 
 // Active state
-// ------------
-.dropdown-menu > .active > a,
-.dropdown-menu > .active > a:hover,
-.dropdown-menu > .active > a:focus {
-  color: $dropdownLinkColorActive;
-  text-decoration: none;
-  outline: 0;
-  @include gradient-vertical($dropdownLinkBackgroundActive, darken($dropdownLinkBackgroundActive, 5%));
+.dropdown-menu > .active > a {
+  &,
+  &:hover,
+  &:focus {
+    color: $dropdown-link-active-color;
+    text-decoration: none;
+    outline: 0;
+    background-color: $dropdown-link-active-bg;
+  }
 }
 
 // Disabled state
-// --------------
+//
 // Gray out text and ensure the hover/focus state remains gray
-.dropdown-menu > .disabled > a,
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  color: $grayLight;
+
+.dropdown-menu > .disabled > a {
+  &,
+  &:hover,
+  &:focus {
+    color: $dropdown-link-disabled-color;
+  }
 }
 // Nuke hover/focus effects
-.dropdown-menu > .disabled > a:hover,
-.dropdown-menu > .disabled > a:focus {
-  text-decoration: none;
-  background-color: transparent;
-  background-image: none; // Remove CSS gradient
-  @include reset-filter();
-  cursor: default;
+.dropdown-menu > .disabled > a {
+  &:hover,
+  &:focus {
+    text-decoration: none;
+    background-color: transparent;
+    background-image: none; // Remove CSS gradient
+    @include reset-filter();
+    cursor: not-allowed;
+  }
 }
 
 // Open state for the dropdown
-// ---------------------------
 .open {
-  // IE7's z-index only goes to the nearest positioned ancestor, which would
-  // make the menu appear below buttons that appeared later on the page
-  *z-index: $zindexDropdown;
-
-  & > .dropdown-menu {
+  // Show the menu
+  > .dropdown-menu {
     display: block;
   }
+
+  // Remove the outline when :focus is triggered
+  > a {
+    outline: 0;
+  }
+}
+
+// Menu positioning
+//
+// Add extra class to `.dropdown-menu` to flip the alignment of the dropdown
+// menu with the parent.
+.dropdown-menu-right {
+  left: auto; // Reset the default from `.dropdown-menu`
+  right: 0;
+}
+// With v3, we enabled auto-flipping if you have a dropdown within a right
+// aligned nav component. To enable the undoing of that, we provide an override
+// to restore the default dropdown menu alignment.
+//
+// This is only for left-aligning a dropdown menu within a `.navbar-right` or
+// `.pull-right` nav component.
+.dropdown-menu-left {
+  left: 0;
+  right: auto;
+}
+
+// Dropdown section headers
+.dropdown-header {
+  display: block;
+  padding: 3px 20px;
+  font-size: $font-size-small;
+  line-height: $line-height-base;
+  color: $dropdown-header-color;
+  white-space: nowrap; // as with > li > a
 }
 
 // Backdrop to catch body clicks on mobile, etc.
-// ---------------------------
 .dropdown-backdrop {
   position: fixed;
   left: 0;
   right: 0;
   bottom: 0;
   top: 0;
-  z-index: $zindexDropdown - 10;
+  z-index: ($zindex-dropdown - 10);
 }
 
 // Right aligned dropdowns
-// ---------------------------
 .pull-right > .dropdown-menu {
   right: 0;
   left: auto;
 }
 
 // Allow for dropdowns to go bottom up (aka, dropup-menu)
-// ------------------------------------------------------
+//
 // Just add .dropup after the standard .dropdown class and you're set, bro.
 // TODO: abstract this so that the navbar fixed styles are not placed here?
+
 .dropup,
 .navbar-fixed-bottom .dropdown {
   // Reverse the caret
   .caret {
     border-top: 0;
-    border-bottom: 4px solid $black;
+    border-bottom: $caret-width-base solid;
     content: "";
   }
   // Different positioning for bottom up menu
@@ -173,76 +195,21 @@
   }
 }
 
-// Sub menus
-// ---------------------------
-.dropdown-submenu {
-  position: relative;
-}
-// Default dropdowns
-.dropdown-submenu > .dropdown-menu {
-  top: 0;
-  left: 100%;
-  margin-top: -6px;
-  margin-left: -1px;
-  @include border-radius(0 6px 6px 6px);
-}
-.dropdown-submenu:hover > .dropdown-menu {
-  display: block;
-}
 
-// Dropups
-.dropup .dropdown-submenu > .dropdown-menu {
-  top: auto;
-  bottom: 0;
-  margin-top: 0;
-  margin-bottom: -2px;
-  @include border-radius(5px 5px 5px 0);
-}
-
-// Caret to indicate there is a submenu
-.dropdown-submenu > a:after {
-  display: block;
-  content: " ";
-  float: right;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
-  border-width: 5px 0 5px 5px;
-  border-left-color: darken($dropdownBackground, 20%);
-  margin-top: 5px;
-  margin-right: -10px;
-}
-.dropdown-submenu:hover > a:after {
-  border-left-color: $dropdownLinkColorHover;
-}
-
-// Left aligned submenus
-.dropdown-submenu.pull-left {
-  // Undo the float
-  // Yes, this is awkward since .pull-left adds a float, but it sticks to our conventions elsewhere.
-  float: none;
-
-  // Positioning the submenu
-  > .dropdown-menu {
-    left: -100%;
-    margin-left: 10px;
-    @include border-radius(6px 0 6px 6px);
+// Component alignment
+//
+// Reiterate per navbar.less and the modified component alignment there.
+
+@media (min-width: $grid-float-breakpoint) {
+  .navbar-right {
+    .dropdown-menu {
+      right: 0; left: auto;
+    }
+    // Necessary for overrides of the default right aligned menu.
+    // Will remove come v4 in all likelihood.
+    .dropdown-menu-left {
+      left: 0; right: auto;
+    }
   }
 }
 
-// Tweak nav headers
-// -----------------
-// Increase padding from 15px to 20px on sides
-.dropdown .dropdown-menu .nav-header {
-  padding-left: 20px;
-  padding-right: 20px;
-}
-
-// Typeahead
-// ---------
-.typeahead {
-  z-index: 1051;
-  margin-top: 2px; // give it some space to breathe
-  @include border-radius($baseBorderRadius);
-}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_forms.scss b/app/assets/stylesheets/rails_admin/bootstrap/_forms.scss
old mode 100755
new mode 100644
index 6b05636cdd..74bb67d8e9
--- a/app/assets/stylesheets/rails_admin/bootstrap/_forms.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_forms.scss
@@ -3,167 +3,68 @@
 // --------------------------------------------------
 
 
-// GENERAL STYLES
-// --------------
-
-// Make all forms have space below them
-form {
-  margin: 0 0 $baseLineHeight;
-}
+// Normalize non-controls
+//
+// Restyle and baseline non-control form elements.
 
 fieldset {
   padding: 0;
   margin: 0;
   border: 0;
+  // Chrome and Firefox set a `min-width: min-content;` on fieldsets,
+  // so we reset that to ensure it behaves more like a standard block element.
+  // See https://github.com/twbs/bootstrap/issues/12359.
+  min-width: 0;
 }
 
-// Groups of fields with labels on top (legends)
 legend {
   display: block;
   width: 100%;
   padding: 0;
-  margin-bottom: $baseLineHeight;
-  font-size: $baseFontSize * 1.5;
-  line-height: $baseLineHeight * 2;
-  color: $grayDark;
+  margin-bottom: $line-height-computed;
+  font-size: ($font-size-base * 1.5);
+  line-height: inherit;
+  color: $legend-color;
   border: 0;
-  border-bottom: 1px solid #e5e5e5;
-
-  // Small
-  small {
-    font-size: $baseLineHeight * .75;
-    color: $grayLight;
-  }
-}
-
-// Set font for forms
-label,
-input,
-button,
-select,
-textarea {
-  @include font-shorthand($baseFontSize, normal, $baseLineHeight); // Set size, weight, line-height here
-}
-input,
-button,
-select,
-textarea {
-  font-family: $baseFontFamily; // And only set font-family here for those that need it (note the missing label element)
+  border-bottom: 1px solid $legend-border-color;
 }
 
-// Identify controls by their labels
 label {
-  display: block;
+  display: inline-block;
+  max-width: 100%; // Force IE8 to wrap long content (see https://github.com/twbs/bootstrap/issues/13141)
   margin-bottom: 5px;
+  font-weight: bold;
 }
 
-// Form controls
-// -------------------------
 
-// Shared size and type resets
-select,
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-  display: inline-block;
-  height: $baseLineHeight;
-  padding: 4px 6px;
-  margin-bottom: $baseLineHeight / 2;;
-  font-size: $baseFontSize;
-  line-height: $baseLineHeight;
-  color: $gray;
-  @include border-radius($inputBorderRadius);
-  vertical-align: middle;
-}
+// Normalize form controls
+//
+// While most of our form styles require extra classes, some basic normalization
+// is required to ensure optimum display with or without those classes to better
+// address browser inconsistencies.
 
-// Reset appearance properties for textual inputs and textarea
-// Declare width for legacy (can't be on input[type=*] selectors or it's too specific)
-input,
-textarea,
-.uneditable-input {
-  width: 206px; // plus 12px padding and 2px border
-}
-// Reset height since textareas have rows
-textarea {
-  height: auto;
-}
-// Everything else
-textarea,
-input[type="text"],
-input[type="password"],
-input[type="datetime"],
-input[type="datetime-local"],
-input[type="date"],
-input[type="month"],
-input[type="time"],
-input[type="week"],
-input[type="number"],
-input[type="email"],
-input[type="url"],
-input[type="search"],
-input[type="tel"],
-input[type="color"],
-.uneditable-input {
-  background-color: $inputBackground;
-  border: 1px solid $inputBorder;
-  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
-  @include transition(border linear .2s, box-shadow linear .2s);
-
-  // Focus state
-  &:focus {
-    border-color: rgba(82,168,236,.8);
-    outline: 0;
-    outline: thin dotted \9; /* IE6-9 */
-    @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6));
-  }
+// Override content-box in Normalize (* isn't specific enough)
+input[type="search"] {
+  @include box-sizing(border-box);
 }
 
 // Position radios and checkboxes better
 input[type="radio"],
 input[type="checkbox"] {
   margin: 4px 0 0;
-  *margin-top: 0; /* IE7 */
-  margin-top: 1px \9; /* IE8-9 */
+  margin-top: 1px \9; // IE8-9
   line-height: normal;
 }
 
-// Reset width of input images, buttons, radios, checkboxes
-input[type="file"],
-input[type="image"],
-input[type="submit"],
-input[type="reset"],
-input[type="button"],
-input[type="radio"],
-input[type="checkbox"] {
-  width: auto; // Override of generic input selector
-}
-
-// Set the height of select and file controls to match text inputs
-select,
+// Set the height of file controls to match text inputs
 input[type="file"] {
-  height: $inputHeight; /* In IE7, the height of the select element cannot be changed by height, only font-size */
-  *margin-top: 4px; /* For IE7, add top margin to align select with labels */
-  line-height: $inputHeight;
+  display: block;
 }
 
-// Make select elements obey height by applying a border
-select {
-  width: 220px; // default input width + 10px of padding that doesn't get applied
-  border: 1px solid $inputBorder;
-  background-color: $inputBackground; // Chrome on Linux and Mobile Safari need background-color
+// Make range inputs behave like textual form controls
+input[type="range"] {
+  display: block;
+  width: 100%;
 }
 
 // Make multiple select elements height not fixed
@@ -172,518 +73,466 @@ select[size] {
   height: auto;
 }
 
-// Focus for select, file, radio, and checkbox
-select:focus,
+// Focus for file, radio, and checkbox
 input[type="file"]:focus,
 input[type="radio"]:focus,
 input[type="checkbox"]:focus {
   @include tab-focus();
 }
 
+// Adjust output element
+output {
+  display: block;
+  padding-top: ($padding-base-vertical + 1);
+  font-size: $font-size-base;
+  line-height: $line-height-base;
+  color: $input-color;
+}
+
 
-// Uneditable inputs
-// -------------------------
+// Common form controls
+//
+// Shared size and type resets for form controls. Apply `.form-control` to any
+// of the following form controls:
+//
+// select
+// textarea
+// input[type="text"]
+// input[type="password"]
+// input[type="datetime"]
+// input[type="datetime-local"]
+// input[type="date"]
+// input[type="month"]
+// input[type="time"]
+// input[type="week"]
+// input[type="number"]
+// input[type="email"]
+// input[type="url"]
+// input[type="search"]
+// input[type="tel"]
+// input[type="color"]
+
+.form-control {
+  display: block;
+  width: 100%;
+  height: $input-height-base; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
+  padding: $padding-base-vertical $padding-base-horizontal;
+  font-size: $font-size-base;
+  line-height: $line-height-base;
+  color: $input-color;
+  background-color: $input-bg;
+  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
+  border: 1px solid $input-border;
+  border-radius: $input-border-radius;
+  @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
+  @include transition(border-color ease-in-out .15s, box-shadow ease-in-out .15s);
 
-// Make uneditable inputs look inactive
-.uneditable-input,
-.uneditable-textarea {
-  color: $grayLight;
-  background-color: darken($inputBackground, 1%);
-  border-color: $inputBorder;
-  @include box-shadow(inset 0 1px 2px rgba(0,0,0,.025));
-  cursor: not-allowed;
-}
+  // Customize the `:focus` state to imitate native WebKit styles.
+  @include form-control-focus();
+
+  // Placeholder
+  @include placeholder();
+
+  // Disabled and read-only inputs
+  //
+  // HTML5 says that controls under a fieldset > legend:first-child won't be
+  // disabled if the fieldset is disabled. Due to implementation difficulty, we
+  // don't honor that edge case; we style them as disabled anyway.
+  &[disabled],
+  &[readonly],
+  fieldset[disabled] & {
+    cursor: not-allowed;
+    background-color: $input-bg-disabled;
+    opacity: 1; // iOS fix for unreadable disabled content
+  }
 
-// For text that needs to appear as an input but should not be an input
-.uneditable-input {
-  overflow: hidden; // prevent text from wrapping, but still cut it off like an input does
-  white-space: nowrap;
+  // [converter] extracted textarea& to textarea.form-control
 }
 
-// Make uneditable textareas behave like a textarea
-.uneditable-textarea {
-  width: auto;
+// Reset height for `textarea`s
+textarea.form-control {
   height: auto;
 }
 
 
-// Placeholder
-// -------------------------
+// Search inputs in iOS
+//
+// This overrides the extra rounded corners on search inputs in iOS so that our
+// `.form-control` class can properly style them. Note that this cannot simply
+// be added to `.form-control` as it's not specific enough. For details, see
+// https://github.com/twbs/bootstrap/issues/11586.
 
-// Placeholder text gets special styles because when browsers invalidate entire lines if it doesn't understand a selector
-input,
-textarea {
-  @include placeholder();
+input[type="search"] {
+  -webkit-appearance: none;
 }
 
 
-// CHECKBOXES & RADIOS
-// -------------------
+// Special styles for iOS temporal inputs
+//
+// In Mobile Safari, setting `display: block` on temporal inputs causes the
+// text within the input to become vertically misaligned.
+// As a workaround, we set a pixel line-height that matches the
+// given height of the input. Since this fucks up everything else, we have to
+// appropriately reset it for Internet Explorer and the size variations.
+
+input[type="date"],
+input[type="time"],
+input[type="datetime-local"],
+input[type="month"] {
+  line-height: $input-height-base;
+  // IE8+ misaligns the text within date inputs, so we reset
+  line-height: $line-height-base #{\0};
+
+  &.input-sm {
+    line-height: $input-height-small;
+  }
+  &.input-lg {
+    line-height: $input-height-large;
+  }
+}
+
+
+// Form groups
+//
+// Designed to help with the organization and spacing of vertical forms. For
+// horizontal forms, use the predefined grid classes.
+
+.form-group {
+  margin-bottom: 15px;
+}
+
+
+// Checkboxes and radios
+//
+// Indent the labels to position radios/checkboxes as hanging controls.
 
-// Indent the labels to position radios/checkboxes as hanging
 .radio,
 .checkbox {
-  min-height: $baseLineHeight; // clear the floating input if there is no label text
-  padding-left: 20px;
+  position: relative;
+  display: block;
+  min-height: $line-height-computed; // clear the floating input if there is no label text
+  margin-top: 10px;
+  margin-bottom: 10px;
+
+  label {
+    padding-left: 20px;
+    margin-bottom: 0;
+    font-weight: normal;
+    cursor: pointer;
+  }
 }
 .radio input[type="radio"],
-.checkbox input[type="checkbox"] {
-  float: left;
+.radio-inline input[type="radio"],
+.checkbox input[type="checkbox"],
+.checkbox-inline input[type="checkbox"] {
+  position: absolute;
   margin-left: -20px;
+  margin-top: 4px \9;
 }
 
-// Move the options list down to align with labels
-.controls > .radio:first-child,
-.controls > .checkbox:first-child {
-  padding-top: 5px; // has to be padding because margin collaspes
+.radio + .radio,
+.checkbox + .checkbox {
+  margin-top: -5px; // Move up sibling radios or checkboxes for tighter spacing
 }
 
 // Radios and checkboxes on same line
-// TODO v3: Convert .inline to .control-inline
-.radio.inline,
-.checkbox.inline {
+.radio-inline,
+.checkbox-inline {
   display: inline-block;
-  padding-top: 5px;
+  padding-left: 20px;
   margin-bottom: 0;
   vertical-align: middle;
+  font-weight: normal;
+  cursor: pointer;
 }
-.radio.inline + .radio.inline,
-.checkbox.inline + .checkbox.inline {
+.radio-inline + .radio-inline,
+.checkbox-inline + .checkbox-inline {
+  margin-top: 0;
   margin-left: 10px; // space out consecutive inline controls
 }
 
-
-
-// INPUT SIZES
-// -----------
-
-// General classes for quick sizes
-.input-mini       { width: 60px; }
-.input-small      { width: 90px; }
-.input-medium     { width: 150px; }
-.input-large      { width: 210px; }
-.input-xlarge     { width: 270px; }
-.input-xxlarge    { width: 530px; }
-
-// Grid style input sizes
-input[class*="span"],
-select[class*="span"],
-textarea[class*="span"],
-.uneditable-input[class*="span"],
-// Redeclare since the fluid row class is more specific
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"] {
-  float: none;
-  margin-left: 0;
-}
-// Ensure input-prepend/append never wraps
-.input-append input[class*="span"],
-.input-append .uneditable-input[class*="span"],
-.input-prepend input[class*="span"],
-.input-prepend .uneditable-input[class*="span"],
-.row-fluid input[class*="span"],
-.row-fluid select[class*="span"],
-.row-fluid textarea[class*="span"],
-.row-fluid .uneditable-input[class*="span"],
-.row-fluid .input-prepend [class*="span"],
-.row-fluid .input-append [class*="span"] {
-  display: inline-block;
-}
-
-
-
-// GRID SIZING FOR INPUTS
-// ----------------------
-
-// Grid sizes
-@include grid-input($gridColumnWidth, $gridGutterWidth);
-
-// Control row for multiple inputs per line
-.controls-row {
-  @include clearfix(); // Clear the float from controls
+// Apply same disabled cursor tweak as for inputs
+// Some special care is needed because <label>s don't inherit their parent's `cursor`.
+//
+// Note: Neither radios nor checkboxes can be readonly.
+input[type="radio"],
+input[type="checkbox"] {
+  &[disabled],
+  &.disabled,
+  fieldset[disabled] & {
+    cursor: not-allowed;
+  }
 }
-
-// Float to collapse white-space for proper grid alignment
-.controls-row [class*="span"],
-// Redeclare the fluid grid collapse since we undo the float for inputs
-.row-fluid .controls-row [class*="span"] {
-  float: left;
+// These classes are used directly on <label>s
+.radio-inline,
+.checkbox-inline {
+  &.disabled,
+  fieldset[disabled] & {
+    cursor: not-allowed;
+  }
 }
-// Explicity set top padding on all checkboxes/radios, not just first-child
-.controls-row .checkbox[class*="span"],
-.controls-row .radio[class*="span"] {
-  padding-top: 5px;
+// These classes are used on elements with <label> descendants
+.radio,
+.checkbox {
+  &.disabled,
+  fieldset[disabled] & {
+    label {
+      cursor: not-allowed;
+    }
+  }
 }
 
 
+// Static form control text
+//
+// Apply class to a `p` element to make any string of text align with labels in
+// a horizontal form layout.
+
+.form-control-static {
+  // Size it appropriately next to real form controls
+  padding-top: ($padding-base-vertical + 1);
+  padding-bottom: ($padding-base-vertical + 1);
+  // Remove default margin from `p`
+  margin-bottom: 0;
 
+  &.input-lg,
+  &.input-sm {
+    padding-left: 0;
+    padding-right: 0;
+  }
+}
 
-// DISABLED STATE
-// --------------
 
-// Disabled and read-only inputs
-input[disabled],
-select[disabled],
-textarea[disabled],
-input[readonly],
-select[readonly],
-textarea[readonly] {
-  cursor: not-allowed;
-  background-color: $inputDisabledBackground;
-}
-// Explicitly reset the colors here
-input[type="radio"][disabled],
-input[type="checkbox"][disabled],
-input[type="radio"][readonly],
-input[type="checkbox"][readonly] {
-  background-color: transparent;
-}
+// Form control sizing
+//
+// Build on `.form-control` with modifier classes to decrease or increase the
+// height and font-size of form controls.
+
+@include input-size('.input-sm', $input-height-small, $padding-small-vertical, $padding-small-horizontal, $font-size-small, $line-height-small, $border-radius-small);
 
+@include input-size('.input-lg', $input-height-large, $padding-large-vertical, $padding-large-horizontal, $font-size-large, $line-height-large, $border-radius-large);
 
 
+// Form control feedback states
+//
+// Apply contextual and semantic states to individual form controls.
 
-// FORM FIELD FEEDBACK STATES
-// --------------------------
+.has-feedback {
+  // Enable absolute positioning
+  position: relative;
 
-// Warning
-.control-group.warning {
-  @include formFieldState($warningText, $warningText, $warningBackground);
+  // Ensure icons don't overlap text
+  .form-control {
+    padding-right: ($input-height-base * 1.25);
+  }
 }
-// Error
-.control-group.error {
-  @include formFieldState($errorText, $errorText, $errorBackground);
+// Feedback icon (requires .glyphicon classes)
+.form-control-feedback {
+  position: absolute;
+  top: ($line-height-computed + 5); // Height of the `label` and its margin
+  right: 0;
+  z-index: 2; // Ensure icon is above input groups
+  display: block;
+  width: $input-height-base;
+  height: $input-height-base;
+  line-height: $input-height-base;
+  text-align: center;
 }
-// Success
-.control-group.success {
-  @include formFieldState($successText, $successText, $successBackground);
+.input-lg + .form-control-feedback {
+  width: $input-height-large;
+  height: $input-height-large;
+  line-height: $input-height-large;
 }
-// Info
-.control-group.info {
-  @include formFieldState($infoText, $infoText, $infoBackground);
+.input-sm + .form-control-feedback {
+  width: $input-height-small;
+  height: $input-height-small;
+  line-height: $input-height-small;
 }
 
-// HTML5 invalid states
-// Shares styles with the .control-group.error above
-input:focus:invalid,
-textarea:focus:invalid,
-select:focus:invalid {
-  color: #b94a48;
-  border-color: #ee5f5b;
-  &:focus {
-    border-color: darken(#ee5f5b, 10%);
-    @include box-shadow(0 0 6px lighten(#ee5f5b, 20%));
-  }
+// Feedback states
+.has-success {
+  @include form-control-validation($state-success-text, $state-success-text, $state-success-bg);
 }
-
-
-
-// FORM ACTIONS
-// ------------
-
-.form-actions {
-  padding: ($baseLineHeight - 1) 20px $baseLineHeight;
-  margin-top: $baseLineHeight;
-  margin-bottom: $baseLineHeight;
-  background-color: $formActionsBackground;
-  border-top: 1px solid #e5e5e5;
-  @include clearfix(); // Adding clearfix to allow for .pull-right button containers
+.has-warning {
+  @include form-control-validation($state-warning-text, $state-warning-text, $state-warning-bg);
+}
+.has-error {
+  @include form-control-validation($state-danger-text, $state-danger-text, $state-danger-bg);
 }
 
 
+// Reposition feedback icon if label is hidden with "screenreader only" state
+.has-feedback label.sr-only ~ .form-control-feedback {
+  top: 0;
+}
 
-// HELP TEXT
-// ---------
 
-.help-block,
-.help-inline {
-  color: lighten($textColor, 15%); // lighten the text some for contrast
-}
+// Help text
+//
+// Apply to any element you wish to create light text for placement immediately
+// below a form control. Use for general help, formatting, or instructional text.
 
 .help-block {
   display: block; // account for any element using help-block
-  margin-bottom: $baseLineHeight / 2;
+  margin-top: 5px;
+  margin-bottom: 10px;
+  color: lighten($text-color, 25%); // lighten the text some for contrast
 }
 
-.help-inline {
-  display: inline-block;
-  @include ie7-inline-block();
-  vertical-align: middle;
-  padding-left: 5px;
-}
 
 
+// Inline forms
+//
+// Make forms appear inline(-block) by adding the `.form-inline` class. Inline
+// forms begin stacked on extra small (mobile) devices and then go inline when
+// viewports reach <768px.
+//
+// Requires wrapping inputs and labels with `.form-group` for proper display of
+// default HTML form controls and our custom form controls (e.g., input groups).
+//
+// Heads up! This is mixin-ed into `.navbar-form` in navbars.less.
 
-// INPUT GROUPS
-// ------------
+.form-inline {
 
-// Allow us to put symbols and text within the input field for a cleaner look
-.input-append,
-.input-prepend {
-  display: inline-block;
-  margin-bottom: $baseLineHeight / 2;
-  vertical-align: middle;
-  font-size: 0; // white space collapse hack
-  white-space: nowrap; // Prevent span and input from separating
-
-  // Reset the white space collapse hack
-  input,
-  select,
-  .uneditable-input,
-  .dropdown-menu,
-  .popover {
-    font-size: $baseFontSize;
-  }
+  // Kick in the inline
+  @media (min-width: $screen-sm-min) {
+    // Inline-block all the things for "inline"
+    .form-group {
+      display: inline-block;
+      margin-bottom: 0;
+      vertical-align: middle;
+    }
 
-  input,
-  select,
-  .uneditable-input {
-    position: relative; // placed here by default so that on :focus we can place the input above the .add-on for full border and box-shadow goodness
-    margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
-    *margin-left: 0;
-    vertical-align: top;
-    @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
-    // Make input on top when focused so blue border and shadow always show
-    &:focus {
-      z-index: 2;
+    // In navbar-form, allow folks to *not* use `.form-group`
+    .form-control {
+      display: inline-block;
+      width: auto; // Prevent labels from stacking above inputs in `.form-group`
+      vertical-align: middle;
     }
-  }
-  .add-on {
-    display: inline-block;
-    width: auto;
-    height: $baseLineHeight;
-    min-width: 16px;
-    padding: 4px 5px;
-    font-size: $baseFontSize;
-    font-weight: normal;
-    line-height: $baseLineHeight;
-    text-align: center;
-    text-shadow: 0 1px 0 $white;
-    background-color: $grayLighter;
-    border: 1px solid #ccc;
-  }
-  .add-on,
-  .btn,
-  .btn-group > .dropdown-toggle {
-    vertical-align: top;
-    @include border-radius(0);
-  }
-  .active {
-    background-color: lighten($green, 30);
-    border-color: $green;
-  }
-}
 
-.input-prepend {
-  .add-on,
-  .btn {
-    margin-right: -1px;
-  }
-  .add-on:first-child,
-  .btn:first-child {
-    // FYI, `.btn:first-child` accounts for a button group that's prepended
-    @include border-radius($inputBorderRadius 0 0 $inputBorderRadius);
-  }
-}
+    .input-group {
+      display: inline-table;
+      vertical-align: middle;
 
-.input-append {
-  input,
-  select,
-  .uneditable-input {
-    @include border-radius($inputBorderRadius 0 0 $inputBorderRadius);
-    + .btn-group .btn:last-child {
-      @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
+      .input-group-addon,
+      .input-group-btn,
+      .form-control {
+        width: auto;
+      }
     }
-  }
-  .add-on,
-  .btn,
-  .btn-group {
-    margin-left: -1px;
-  }
-  .add-on:last-child,
-  .btn:last-child,
-  .btn-group:last-child > .dropdown-toggle {
-    @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
-  }
-}
 
-// Remove all border-radius for inputs with both prepend and append
-.input-prepend.input-append {
-  input,
-  select,
-  .uneditable-input {
-    @include border-radius(0);
-    + .btn-group .btn {
-      @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
+    // Input groups need that 100% width though
+    .input-group > .form-control {
+      width: 100%;
     }
-  }
-  .add-on:first-child,
-  .btn:first-child {
-    margin-right: -1px;
-    @include border-radius($inputBorderRadius 0 0 $inputBorderRadius);
-  }
-  .add-on:last-child,
-  .btn:last-child {
-    margin-left: -1px;
-    @include border-radius(0 $inputBorderRadius $inputBorderRadius 0);
-  }
-  .btn-group:first-child {
-    margin-left: 0;
-  }
-}
-
-
-
 
-// SEARCH FORM
-// -----------
+    .control-label {
+      margin-bottom: 0;
+      vertical-align: middle;
+    }
 
-input.search-query {
-  padding-right: 14px;
-  padding-right: 4px \9;
-  padding-left: 14px;
-  padding-left: 4px \9; /* IE7-8 doesn't have border-radius, so don't indent the padding */
-  margin-bottom: 0; // Remove the default margin on all inputs
-  @include border-radius(15px);
-}
+    // Remove default margin on radios/checkboxes that were used for stacking, and
+    // then undo the floating of radios and checkboxes to match (which also avoids
+    // a bug in WebKit: https://github.com/twbs/bootstrap/issues/1969).
+    .radio,
+    .checkbox {
+      display: inline-block;
+      margin-top: 0;
+      margin-bottom: 0;
+      vertical-align: middle;
+
+      label {
+        padding-left: 0;
+      }
+    }
+    .radio input[type="radio"],
+    .checkbox input[type="checkbox"] {
+      position: relative;
+      margin-left: 0;
+    }
 
-/* Allow for input prepend/append in search forms */
-.form-search .input-append .search-query,
-.form-search .input-prepend .search-query {
-  @include border-radius(0); // Override due to specificity
-}
-.form-search .input-append .search-query {
-  @include border-radius(14px 0 0 14px);
-}
-.form-search .input-append .btn {
-  @include border-radius(0 14px 14px 0);
-}
-.form-search .input-prepend .search-query {
-  @include border-radius(0 14px 14px 0);
-}
-.form-search .input-prepend .btn {
-  @include border-radius(14px 0 0 14px);
+    // Validation states
+    //
+    // Reposition the icon because it's now within a grid column and columns have
+    // `position: relative;` on them. Also accounts for the grid gutter padding.
+    .has-feedback .form-control-feedback {
+      top: 0;
+    }
+  }
 }
 
 
+// Horizontal forms
+//
+// Horizontal forms are built on grid classes and allow you to create forms with
+// labels on the left and inputs on the right.
 
-
-// HORIZONTAL & VERTICAL FORMS
-// ---------------------------
-
-// Common properties
-// -----------------
-
-.form-search,
-.form-inline,
 .form-horizontal {
-  input,
-  textarea,
-  select,
-  .help-inline,
-  .uneditable-input,
-  .input-prepend,
-  .input-append {
-    display: inline-block;
-    @include ie7-inline-block();
+
+  // Consistent vertical alignment of radios and checkboxes
+  //
+  // Labels also get some reset styles, but that is scoped to a media query below.
+  .radio,
+  .checkbox,
+  .radio-inline,
+  .checkbox-inline {
+    margin-top: 0;
     margin-bottom: 0;
-    vertical-align: middle;
+    padding-top: ($padding-base-vertical + 1); // Default padding plus a border
   }
-  // Re-hide hidden elements due to specifity
-  .hide {
-    display: none;
+  // Account for padding we're adding to ensure the alignment and of help text
+  // and other content below items
+  .radio,
+  .checkbox {
+    min-height: ($line-height-computed + ($padding-base-vertical + 1));
   }
-}
-.form-search label,
-.form-inline label,
-.form-search .btn-group,
-.form-inline .btn-group {
-  display: inline-block;
-}
-// Remove margin for input-prepend/-append
-.form-search .input-append,
-.form-inline .input-append,
-.form-search .input-prepend,
-.form-inline .input-prepend {
-  margin-bottom: 0;
-}
-// Inline checkbox/radio labels (remove padding on left)
-.form-search .radio,
-.form-search .checkbox,
-.form-inline .radio,
-.form-inline .checkbox {
-  padding-left: 0;
-  margin-bottom: 0;
-  vertical-align: middle;
-}
-// Remove float and margin, set to inline-block
-.form-search .radio input[type="radio"],
-.form-search .checkbox input[type="checkbox"],
-.form-inline .radio input[type="radio"],
-.form-inline .checkbox input[type="checkbox"] {
-  float: left;
-  margin-right: 3px;
-  margin-left: 0;
-}
-
-
-// Margin to space out fieldsets
-.control-group {
-  margin-bottom: $baseLineHeight / 2;
-}
-
-// Legend collapses margin, so next element is responsible for spacing
-legend + .control-group {
-  margin-top: $baseLineHeight;
-  -webkit-margin-top-collapse: separate;
-}
-
-// Horizontal-specific styles
-// --------------------------
 
-.form-horizontal {
-  // Increase spacing between groups
-  .control-group {
-    margin-bottom: $baseLineHeight;
-    @include clearfix();
+  // Make form groups behave like rows
+  .form-group {
+    @include make-row();
   }
-  // Float the labels left
-  .control-label {
-    float: left;
-    width: $horizontalComponentOffset - 20;
-    padding-top: 5px;
-    text-align: right;
-  }
-  // Move over all input controls and content
-  .controls {
-    // Super jank IE7 fix to ensure the inputs in .input-append and input-prepend
-    // don't inherit the margin of the parent, in this case .controls
-    *display: inline-block;
-    *padding-left: 20px;
-    margin-left: $horizontalComponentOffset;
-    *margin-left: 0;
-    &:first-child {
-      *padding-left: $horizontalComponentOffset;
+
+  // Reset spacing and right align labels, but scope to media queries so that
+  // labels on narrow viewports stack the same as a default form example.
+  @media (min-width: $screen-sm-min) {
+    .control-label {
+      text-align: right;
+      margin-bottom: 0;
+      padding-top: ($padding-base-vertical + 1); // Default padding plus a border
     }
   }
-  // Remove bottom margin on block level help text since that's accounted for on .control-group
-  .help-block {
-    margin-bottom: 0;
+
+  // Validation states
+  //
+  // Reposition the icon because it's now within a grid column and columns have
+  // `position: relative;` on them. Also accounts for the grid gutter padding.
+  .has-feedback .form-control-feedback {
+    top: 0;
+    right: ($grid-gutter-width / 2);
   }
-  // And apply it only to .help-block instances that follow a form control
-  input,
-  select,
-  textarea,
-  .uneditable-input,
-  .input-prepend,
-  .input-append {
-    + .help-block {
-      margin-top: $baseLineHeight / 2;
+
+  // Form group sizes
+  //
+  // Quick utility class for applying `.input-lg` and `.input-sm` styles to the
+  // inputs and labels within a `.form-group`.
+  .form-group-lg {
+    @media (min-width: $screen-sm-min) {
+      .control-label {
+        padding-top: (($padding-large-vertical * $line-height-large) + 1);
+      }
+    }
+    .form-control {
+      @extend .input-lg;
     }
   }
-  // Move over buttons in .form-actions to align with .controls
-  .form-actions {
-    padding-left: $horizontalComponentOffset;
+  .form-group-sm {
+    @media (min-width: $screen-sm-min) {
+      .control-label {
+        padding-top: ($padding-small-vertical + 1);
+      }
+    }
+    .form-control {
+      @extend .input-sm;
+    }
   }
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_glyphicons.scss b/app/assets/stylesheets/rails_admin/bootstrap/_glyphicons.scss
new file mode 100644
index 0000000000..0f6ad34520
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_glyphicons.scss
@@ -0,0 +1,237 @@
+//= depend_on "bootstrap/glyphicons-halflings-regular.eot"
+//= depend_on "bootstrap/glyphicons-halflings-regular.svg"
+//= depend_on "bootstrap/glyphicons-halflings-regular.ttf"
+//= depend_on "bootstrap/glyphicons-halflings-regular.woff"
+//
+// Glyphicons for Bootstrap
+//
+// Since icons are fonts, they can be placed anywhere text is placed and are
+// thus automatically sized to match the surrounding child. To use, create an
+// inline element with the appropriate classes, like so:
+//
+// <a href="#"><span class="glyphicon glyphicon-star"></span> Star</a>
+
+// Import the fonts
+@font-face {
+  font-family: 'Glyphicons Halflings';
+  src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot'), '#{$icon-font-path}#{$icon-font-name}.eot'));
+  src: url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.eot?#iefix'), '#{$icon-font-path}#{$icon-font-name}.eot?#iefix')) format('embedded-opentype'),
+       url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.woff'), '#{$icon-font-path}#{$icon-font-name}.woff')) format('woff'),
+       url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.ttf'), '#{$icon-font-path}#{$icon-font-name}.ttf')) format('truetype'),
+       url(if($bootstrap-sass-asset-helper, twbs-font-path('#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}'), '#{$icon-font-path}#{$icon-font-name}.svg##{$icon-font-svg-id}')) format('svg');
+}
+
+// Catchall baseclass
+.glyphicon {
+  position: relative;
+  top: 1px;
+  display: inline-block;
+  font-family: 'Glyphicons Halflings';
+  font-style: normal;
+  font-weight: normal;
+  line-height: 1;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+// Individual icons
+.glyphicon-asterisk               { &:before { content: "\2a"; } }
+.glyphicon-plus                   { &:before { content: "\2b"; } }
+.glyphicon-euro                   { &:before { content: "\20ac"; } }
+.glyphicon-minus                  { &:before { content: "\2212"; } }
+.glyphicon-cloud                  { &:before { content: "\2601"; } }
+.glyphicon-envelope               { &:before { content: "\2709"; } }
+.glyphicon-pencil                 { &:before { content: "\270f"; } }
+.glyphicon-glass                  { &:before { content: "\e001"; } }
+.glyphicon-music                  { &:before { content: "\e002"; } }
+.glyphicon-search                 { &:before { content: "\e003"; } }
+.glyphicon-heart                  { &:before { content: "\e005"; } }
+.glyphicon-star                   { &:before { content: "\e006"; } }
+.glyphicon-star-empty             { &:before { content: "\e007"; } }
+.glyphicon-user                   { &:before { content: "\e008"; } }
+.glyphicon-film                   { &:before { content: "\e009"; } }
+.glyphicon-th-large               { &:before { content: "\e010"; } }
+.glyphicon-th                     { &:before { content: "\e011"; } }
+.glyphicon-th-list                { &:before { content: "\e012"; } }
+.glyphicon-ok                     { &:before { content: "\e013"; } }
+.glyphicon-remove                 { &:before { content: "\e014"; } }
+.glyphicon-zoom-in                { &:before { content: "\e015"; } }
+.glyphicon-zoom-out               { &:before { content: "\e016"; } }
+.glyphicon-off                    { &:before { content: "\e017"; } }
+.glyphicon-signal                 { &:before { content: "\e018"; } }
+.glyphicon-cog                    { &:before { content: "\e019"; } }
+.glyphicon-trash                  { &:before { content: "\e020"; } }
+.glyphicon-home                   { &:before { content: "\e021"; } }
+.glyphicon-file                   { &:before { content: "\e022"; } }
+.glyphicon-time                   { &:before { content: "\e023"; } }
+.glyphicon-road                   { &:before { content: "\e024"; } }
+.glyphicon-download-alt           { &:before { content: "\e025"; } }
+.glyphicon-download               { &:before { content: "\e026"; } }
+.glyphicon-upload                 { &:before { content: "\e027"; } }
+.glyphicon-inbox                  { &:before { content: "\e028"; } }
+.glyphicon-play-circle            { &:before { content: "\e029"; } }
+.glyphicon-repeat                 { &:before { content: "\e030"; } }
+.glyphicon-refresh                { &:before { content: "\e031"; } }
+.glyphicon-list-alt               { &:before { content: "\e032"; } }
+.glyphicon-lock                   { &:before { content: "\e033"; } }
+.glyphicon-flag                   { &:before { content: "\e034"; } }
+.glyphicon-headphones             { &:before { content: "\e035"; } }
+.glyphicon-volume-off             { &:before { content: "\e036"; } }
+.glyphicon-volume-down            { &:before { content: "\e037"; } }
+.glyphicon-volume-up              { &:before { content: "\e038"; } }
+.glyphicon-qrcode                 { &:before { content: "\e039"; } }
+.glyphicon-barcode                { &:before { content: "\e040"; } }
+.glyphicon-tag                    { &:before { content: "\e041"; } }
+.glyphicon-tags                   { &:before { content: "\e042"; } }
+.glyphicon-book                   { &:before { content: "\e043"; } }
+.glyphicon-bookmark               { &:before { content: "\e044"; } }
+.glyphicon-print                  { &:before { content: "\e045"; } }
+.glyphicon-camera                 { &:before { content: "\e046"; } }
+.glyphicon-font                   { &:before { content: "\e047"; } }
+.glyphicon-bold                   { &:before { content: "\e048"; } }
+.glyphicon-italic                 { &:before { content: "\e049"; } }
+.glyphicon-text-height            { &:before { content: "\e050"; } }
+.glyphicon-text-width             { &:before { content: "\e051"; } }
+.glyphicon-align-left             { &:before { content: "\e052"; } }
+.glyphicon-align-center           { &:before { content: "\e053"; } }
+.glyphicon-align-right            { &:before { content: "\e054"; } }
+.glyphicon-align-justify          { &:before { content: "\e055"; } }
+.glyphicon-list                   { &:before { content: "\e056"; } }
+.glyphicon-indent-left            { &:before { content: "\e057"; } }
+.glyphicon-indent-right           { &:before { content: "\e058"; } }
+.glyphicon-facetime-video         { &:before { content: "\e059"; } }
+.glyphicon-picture                { &:before { content: "\e060"; } }
+.glyphicon-map-marker             { &:before { content: "\e062"; } }
+.glyphicon-adjust                 { &:before { content: "\e063"; } }
+.glyphicon-tint                   { &:before { content: "\e064"; } }
+.glyphicon-edit                   { &:before { content: "\e065"; } }
+.glyphicon-share                  { &:before { content: "\e066"; } }
+.glyphicon-check                  { &:before { content: "\e067"; } }
+.glyphicon-move                   { &:before { content: "\e068"; } }
+.glyphicon-step-backward          { &:before { content: "\e069"; } }
+.glyphicon-fast-backward          { &:before { content: "\e070"; } }
+.glyphicon-backward               { &:before { content: "\e071"; } }
+.glyphicon-play                   { &:before { content: "\e072"; } }
+.glyphicon-pause                  { &:before { content: "\e073"; } }
+.glyphicon-stop                   { &:before { content: "\e074"; } }
+.glyphicon-forward                { &:before { content: "\e075"; } }
+.glyphicon-fast-forward           { &:before { content: "\e076"; } }
+.glyphicon-step-forward           { &:before { content: "\e077"; } }
+.glyphicon-eject                  { &:before { content: "\e078"; } }
+.glyphicon-chevron-left           { &:before { content: "\e079"; } }
+.glyphicon-chevron-right          { &:before { content: "\e080"; } }
+.glyphicon-plus-sign              { &:before { content: "\e081"; } }
+.glyphicon-minus-sign             { &:before { content: "\e082"; } }
+.glyphicon-remove-sign            { &:before { content: "\e083"; } }
+.glyphicon-ok-sign                { &:before { content: "\e084"; } }
+.glyphicon-question-sign          { &:before { content: "\e085"; } }
+.glyphicon-info-sign              { &:before { content: "\e086"; } }
+.glyphicon-screenshot             { &:before { content: "\e087"; } }
+.glyphicon-remove-circle          { &:before { content: "\e088"; } }
+.glyphicon-ok-circle              { &:before { content: "\e089"; } }
+.glyphicon-ban-circle             { &:before { content: "\e090"; } }
+.glyphicon-arrow-left             { &:before { content: "\e091"; } }
+.glyphicon-arrow-right            { &:before { content: "\e092"; } }
+.glyphicon-arrow-up               { &:before { content: "\e093"; } }
+.glyphicon-arrow-down             { &:before { content: "\e094"; } }
+.glyphicon-share-alt              { &:before { content: "\e095"; } }
+.glyphicon-resize-full            { &:before { content: "\e096"; } }
+.glyphicon-resize-small           { &:before { content: "\e097"; } }
+.glyphicon-exclamation-sign       { &:before { content: "\e101"; } }
+.glyphicon-gift                   { &:before { content: "\e102"; } }
+.glyphicon-leaf                   { &:before { content: "\e103"; } }
+.glyphicon-fire                   { &:before { content: "\e104"; } }
+.glyphicon-eye-open               { &:before { content: "\e105"; } }
+.glyphicon-eye-close              { &:before { content: "\e106"; } }
+.glyphicon-warning-sign           { &:before { content: "\e107"; } }
+.glyphicon-plane                  { &:before { content: "\e108"; } }
+.glyphicon-calendar               { &:before { content: "\e109"; } }
+.glyphicon-random                 { &:before { content: "\e110"; } }
+.glyphicon-comment                { &:before { content: "\e111"; } }
+.glyphicon-magnet                 { &:before { content: "\e112"; } }
+.glyphicon-chevron-up             { &:before { content: "\e113"; } }
+.glyphicon-chevron-down           { &:before { content: "\e114"; } }
+.glyphicon-retweet                { &:before { content: "\e115"; } }
+.glyphicon-shopping-cart          { &:before { content: "\e116"; } }
+.glyphicon-folder-close           { &:before { content: "\e117"; } }
+.glyphicon-folder-open            { &:before { content: "\e118"; } }
+.glyphicon-resize-vertical        { &:before { content: "\e119"; } }
+.glyphicon-resize-horizontal      { &:before { content: "\e120"; } }
+.glyphicon-hdd                    { &:before { content: "\e121"; } }
+.glyphicon-bullhorn               { &:before { content: "\e122"; } }
+.glyphicon-bell                   { &:before { content: "\e123"; } }
+.glyphicon-certificate            { &:before { content: "\e124"; } }
+.glyphicon-thumbs-up              { &:before { content: "\e125"; } }
+.glyphicon-thumbs-down            { &:before { content: "\e126"; } }
+.glyphicon-hand-right             { &:before { content: "\e127"; } }
+.glyphicon-hand-left              { &:before { content: "\e128"; } }
+.glyphicon-hand-up                { &:before { content: "\e129"; } }
+.glyphicon-hand-down              { &:before { content: "\e130"; } }
+.glyphicon-circle-arrow-right     { &:before { content: "\e131"; } }
+.glyphicon-circle-arrow-left      { &:before { content: "\e132"; } }
+.glyphicon-circle-arrow-up        { &:before { content: "\e133"; } }
+.glyphicon-circle-arrow-down      { &:before { content: "\e134"; } }
+.glyphicon-globe                  { &:before { content: "\e135"; } }
+.glyphicon-wrench                 { &:before { content: "\e136"; } }
+.glyphicon-tasks                  { &:before { content: "\e137"; } }
+.glyphicon-filter                 { &:before { content: "\e138"; } }
+.glyphicon-briefcase              { &:before { content: "\e139"; } }
+.glyphicon-fullscreen             { &:before { content: "\e140"; } }
+.glyphicon-dashboard              { &:before { content: "\e141"; } }
+.glyphicon-paperclip              { &:before { content: "\e142"; } }
+.glyphicon-heart-empty            { &:before { content: "\e143"; } }
+.glyphicon-link                   { &:before { content: "\e144"; } }
+.glyphicon-phone                  { &:before { content: "\e145"; } }
+.glyphicon-pushpin                { &:before { content: "\e146"; } }
+.glyphicon-usd                    { &:before { content: "\e148"; } }
+.glyphicon-gbp                    { &:before { content: "\e149"; } }
+.glyphicon-sort                   { &:before { content: "\e150"; } }
+.glyphicon-sort-by-alphabet       { &:before { content: "\e151"; } }
+.glyphicon-sort-by-alphabet-alt   { &:before { content: "\e152"; } }
+.glyphicon-sort-by-order          { &:before { content: "\e153"; } }
+.glyphicon-sort-by-order-alt      { &:before { content: "\e154"; } }
+.glyphicon-sort-by-attributes     { &:before { content: "\e155"; } }
+.glyphicon-sort-by-attributes-alt { &:before { content: "\e156"; } }
+.glyphicon-unchecked              { &:before { content: "\e157"; } }
+.glyphicon-expand                 { &:before { content: "\e158"; } }
+.glyphicon-collapse-down          { &:before { content: "\e159"; } }
+.glyphicon-collapse-up            { &:before { content: "\e160"; } }
+.glyphicon-log-in                 { &:before { content: "\e161"; } }
+.glyphicon-flash                  { &:before { content: "\e162"; } }
+.glyphicon-log-out                { &:before { content: "\e163"; } }
+.glyphicon-new-window             { &:before { content: "\e164"; } }
+.glyphicon-record                 { &:before { content: "\e165"; } }
+.glyphicon-save                   { &:before { content: "\e166"; } }
+.glyphicon-open                   { &:before { content: "\e167"; } }
+.glyphicon-saved                  { &:before { content: "\e168"; } }
+.glyphicon-import                 { &:before { content: "\e169"; } }
+.glyphicon-export                 { &:before { content: "\e170"; } }
+.glyphicon-send                   { &:before { content: "\e171"; } }
+.glyphicon-floppy-disk            { &:before { content: "\e172"; } }
+.glyphicon-floppy-saved           { &:before { content: "\e173"; } }
+.glyphicon-floppy-remove          { &:before { content: "\e174"; } }
+.glyphicon-floppy-save            { &:before { content: "\e175"; } }
+.glyphicon-floppy-open            { &:before { content: "\e176"; } }
+.glyphicon-credit-card            { &:before { content: "\e177"; } }
+.glyphicon-transfer               { &:before { content: "\e178"; } }
+.glyphicon-cutlery                { &:before { content: "\e179"; } }
+.glyphicon-header                 { &:before { content: "\e180"; } }
+.glyphicon-compressed             { &:before { content: "\e181"; } }
+.glyphicon-earphone               { &:before { content: "\e182"; } }
+.glyphicon-phone-alt              { &:before { content: "\e183"; } }
+.glyphicon-tower                  { &:before { content: "\e184"; } }
+.glyphicon-stats                  { &:before { content: "\e185"; } }
+.glyphicon-sd-video               { &:before { content: "\e186"; } }
+.glyphicon-hd-video               { &:before { content: "\e187"; } }
+.glyphicon-subtitles              { &:before { content: "\e188"; } }
+.glyphicon-sound-stereo           { &:before { content: "\e189"; } }
+.glyphicon-sound-dolby            { &:before { content: "\e190"; } }
+.glyphicon-sound-5-1              { &:before { content: "\e191"; } }
+.glyphicon-sound-6-1              { &:before { content: "\e192"; } }
+.glyphicon-sound-7-1              { &:before { content: "\e193"; } }
+.glyphicon-copyright-mark         { &:before { content: "\e194"; } }
+.glyphicon-registration-mark      { &:before { content: "\e195"; } }
+.glyphicon-cloud-download         { &:before { content: "\e197"; } }
+.glyphicon-cloud-upload           { &:before { content: "\e198"; } }
+.glyphicon-tree-conifer           { &:before { content: "\e199"; } }
+.glyphicon-tree-deciduous         { &:before { content: "\e200"; } }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_grid.scss b/app/assets/stylesheets/rails_admin/bootstrap/_grid.scss
old mode 100755
new mode 100644
index f2b910a16f..f71f8b9015
--- a/app/assets/stylesheets/rails_admin/bootstrap/_grid.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_grid.scss
@@ -3,19 +3,82 @@
 // --------------------------------------------------
 
 
-// Fixed (940px)
-@include grid-core($gridColumnWidth, $gridGutterWidth);
+// Container widths
+//
+// Set the container width, and override it for fixed navbars in media queries.
+
+.container {
+  @include container-fixed();
+
+  @media (min-width: $screen-sm-min) {
+    width: $container-sm;
+  }
+  @media (min-width: $screen-md-min) {
+    width: $container-md;
+  }
+  @media (min-width: $screen-lg-min) {
+    width: $container-lg;
+  }
+}
+
+
+// Fluid container
+//
+// Utilizes the mixin meant for fixed width containers, but without any defined
+// width for fluid, full width layouts.
+
+.container-fluid {
+  @include container-fixed();
+}
+
+
+// Row
+//
+// Rows contain and clear the floats of your columns.
+
+.row {
+  @include make-row();
+}
+
+
+// Columns
+//
+// Common styles for small and large grid columns
+
+@include make-grid-columns();
+
+
+// Extra small grid
+//
+// Columns, offsets, pushes, and pulls for extra small devices like
+// smartphones.
+
+@include make-grid(xs);
+
+
+// Small grid
+//
+// Columns, offsets, pushes, and pulls for the small device range, from phones
+// to tablets.
+
+@media (min-width: $screen-sm-min) {
+  @include make-grid(sm);
+}
+
 
-// Fluid (940px)
-@include grid-fluid($fluidGridColumnWidth, $fluidGridGutterWidth);
+// Medium grid
+//
+// Columns, offsets, pushes, and pulls for the desktop device range.
 
-// Reset utility classes due to specificity
-[class*="span"].hide,
-.row-fluid [class*="span"].hide {
-  display: none;
+@media (min-width: $screen-md-min) {
+  @include make-grid(md);
 }
 
-[class*="span"].pull-right,
-.row-fluid [class*="span"].pull-right {
-  float: right;
+
+// Large grid
+//
+// Columns, offsets, pushes, and pulls for the large desktop device range.
+
+@media (min-width: $screen-lg-min) {
+  @include make-grid(lg);
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_hero-unit.scss b/app/assets/stylesheets/rails_admin/bootstrap/_hero-unit.scss
deleted file mode 100755
index 274527e204..0000000000
--- a/app/assets/stylesheets/rails_admin/bootstrap/_hero-unit.scss
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// Hero unit
-// --------------------------------------------------
-
-
-.hero-unit {
-  padding: 60px;
-  margin-bottom: 30px;
-  font-size: 18px;
-  font-weight: 200;
-  line-height: $baseLineHeight * 1.5;
-  color: $heroUnitLeadColor;
-  background-color: $heroUnitBackground;
-  @include border-radius(6px);
-  h1 {
-    margin-bottom: 0;
-    font-size: 60px;
-    line-height: 1;
-    color: $heroUnitHeadingColor;
-    letter-spacing: -1px;
-  }
-  li {
-    line-height: $baseLineHeight * 1.5; // Reset since we specify in type.scss
-  }
-}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_input-groups.scss b/app/assets/stylesheets/rails_admin/bootstrap/_input-groups.scss
new file mode 100644
index 0000000000..ae0e921bf7
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_input-groups.scss
@@ -0,0 +1,166 @@
+//
+// Input groups
+// --------------------------------------------------
+
+// Base styles
+// -------------------------
+.input-group {
+  position: relative; // For dropdowns
+  display: table;
+  border-collapse: separate; // prevent input groups from inheriting border styles from table cells when placed within a table
+
+  // Undo padding and float of grid classes
+  &[class*="col-"] {
+    float: none;
+    padding-left: 0;
+    padding-right: 0;
+  }
+
+  .form-control {
+    // Ensure that the input is always above the *appended* addon button for
+    // proper border colors.
+    position: relative;
+    z-index: 2;
+
+    // IE9 fubars the placeholder attribute in text inputs and the arrows on
+    // select elements in input groups. To fix it, we float the input. Details:
+    // https://github.com/twbs/bootstrap/issues/11561#issuecomment-28936855
+    float: left;
+
+    width: 100%;
+    margin-bottom: 0;
+  }
+}
+
+// Sizing options
+//
+// Remix the default form control sizing classes into new ones for easier
+// manipulation.
+
+.input-group-lg > .form-control,
+.input-group-lg > .input-group-addon,
+.input-group-lg > .input-group-btn > .btn {
+  @extend .input-lg;
+}
+.input-group-sm > .form-control,
+.input-group-sm > .input-group-addon,
+.input-group-sm > .input-group-btn > .btn {
+  @extend .input-sm;
+}
+
+
+// Display as table-cell
+// -------------------------
+.input-group-addon,
+.input-group-btn,
+.input-group .form-control {
+  display: table-cell;
+
+  &:not(:first-child):not(:last-child) {
+    border-radius: 0;
+  }
+}
+// Addon and addon wrapper for buttons
+.input-group-addon,
+.input-group-btn {
+  width: 1%;
+  white-space: nowrap;
+  vertical-align: middle; // Match the inputs
+}
+
+// Text input groups
+// -------------------------
+.input-group-addon {
+  padding: $padding-base-vertical $padding-base-horizontal;
+  font-size: $font-size-base;
+  font-weight: normal;
+  line-height: 1;
+  color: $input-color;
+  text-align: center;
+  background-color: $input-group-addon-bg;
+  border: 1px solid $input-group-addon-border-color;
+  border-radius: $border-radius-base;
+
+  // Sizing
+  &.input-sm {
+    padding: $padding-small-vertical $padding-small-horizontal;
+    font-size: $font-size-small;
+    border-radius: $border-radius-small;
+  }
+  &.input-lg {
+    padding: $padding-large-vertical $padding-large-horizontal;
+    font-size: $font-size-large;
+    border-radius: $border-radius-large;
+  }
+
+  // Nuke default margins from checkboxes and radios to vertically center within.
+  input[type="radio"],
+  input[type="checkbox"] {
+    margin-top: 0;
+  }
+}
+
+// Reset rounded corners
+.input-group .form-control:first-child,
+.input-group-addon:first-child,
+.input-group-btn:first-child > .btn,
+.input-group-btn:first-child > .btn-group > .btn,
+.input-group-btn:first-child > .dropdown-toggle,
+.input-group-btn:last-child > .btn:not(:last-child):not(.dropdown-toggle),
+.input-group-btn:last-child > .btn-group:not(:last-child) > .btn {
+  @include border-right-radius(0);
+}
+.input-group-addon:first-child {
+  border-right: 0;
+}
+.input-group .form-control:last-child,
+.input-group-addon:last-child,
+.input-group-btn:last-child > .btn,
+.input-group-btn:last-child > .btn-group > .btn,
+.input-group-btn:last-child > .dropdown-toggle,
+.input-group-btn:first-child > .btn:not(:first-child),
+.input-group-btn:first-child > .btn-group:not(:first-child) > .btn {
+  @include border-left-radius(0);
+}
+.input-group-addon:last-child {
+  border-left: 0;
+}
+
+// Button input groups
+// -------------------------
+.input-group-btn {
+  position: relative;
+  // Jankily prevent input button groups from wrapping with `white-space` and
+  // `font-size` in combination with `inline-block` on buttons.
+  font-size: 0;
+  white-space: nowrap;
+
+  // Negative margin for spacing, position for bringing hovered/focused/actived
+  // element above the siblings.
+  > .btn {
+    position: relative;
+    + .btn {
+      margin-left: -1px;
+    }
+    // Bring the "active" button to the front
+    &:hover,
+    &:focus,
+    &:active {
+      z-index: 2;
+    }
+  }
+
+  // Negative margin to only have a 1px border between the two
+  &:first-child {
+    > .btn,
+    > .btn-group {
+      margin-right: -1px;
+    }
+  }
+  &:last-child {
+    > .btn,
+    > .btn-group {
+      margin-left: -1px;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_jumbotron.scss b/app/assets/stylesheets/rails_admin/bootstrap/_jumbotron.scss
new file mode 100644
index 0000000000..75efe64e05
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_jumbotron.scss
@@ -0,0 +1,48 @@
+//
+// Jumbotron
+// --------------------------------------------------
+
+
+.jumbotron {
+  padding: $jumbotron-padding;
+  margin-bottom: $jumbotron-padding;
+  color: $jumbotron-color;
+  background-color: $jumbotron-bg;
+
+  h1,
+  .h1 {
+    color: $jumbotron-heading-color;
+  }
+  p {
+    margin-bottom: ($jumbotron-padding / 2);
+    font-size: $jumbotron-font-size;
+    font-weight: 200;
+  }
+
+  > hr {
+    border-top-color: darken($jumbotron-bg, 10%);
+  }
+
+  .container & {
+    border-radius: $border-radius-large; // Only round corners at higher resolutions if contained in a container
+  }
+
+  .container {
+    max-width: 100%;
+  }
+
+  @media screen and (min-width: $screen-sm-min) {
+    padding-top:    ($jumbotron-padding * 1.6);
+    padding-bottom: ($jumbotron-padding * 1.6);
+
+    .container & {
+      padding-left:  ($jumbotron-padding * 2);
+      padding-right: ($jumbotron-padding * 2);
+    }
+
+    h1,
+    .h1 {
+      font-size: ($font-size-base * 4.5);
+    }
+  }
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_labels-badges.scss b/app/assets/stylesheets/rails_admin/bootstrap/_labels-badges.scss
deleted file mode 100755
index 8f17e58a93..0000000000
--- a/app/assets/stylesheets/rails_admin/bootstrap/_labels-badges.scss
+++ /dev/null
@@ -1,83 +0,0 @@
-//
-// Labels and badges
-// --------------------------------------------------
-
-
-// Base classes
-.label,
-.badge {
-  display: inline-block;
-  padding: 2px 4px;
-  font-size: $baseFontSize * .846;
-  font-weight: bold;
-  line-height: 14px; // ensure proper line-height if floated
-  color: $white;
-  vertical-align: baseline;
-  white-space: nowrap;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-  background-color: $grayLight;
-}
-// Set unique padding and border-radii
-.label {
-  @include border-radius(3px);
-}
-.badge {
-  padding-left: 9px;
-  padding-right: 9px;
-  @include border-radius(9px);
-}
-
-// Empty labels/badges collapse
-.label,
-.badge {
-  &:empty {
-    display: none;
-  }
-}
-
-// Hover/focus state, but only for links
-a {
-  &.label:hover,
-  &.label:focus,
-  &.badge:hover,
-  &.badge:focus {
-    color: $white;
-    text-decoration: none;
-    cursor: pointer;
-  }
-}
-
-// Colors
-// Only give background-color difference to links (and to simplify, we don't qualifty with `a` but [href] attribute)
-@each $item in label, badge {
-  // Important (red)
-  .#{$item}-important         { background-color: $errorText; }
-  .#{$item}-important[href]   { background-color: darken($errorText, 10%); }
-  // Warnings (orange)
-  .#{$item}-warning           { background-color: $orange; }
-  .#{$item}-warning[href]     { background-color: darken($orange, 10%); }
-  // Success (green)
-  .#{$item}-success           { background-color: $successText; }
-  .#{$item}-success[href]     { background-color: darken($successText, 10%); }
-  // Info (turquoise)
-  .#{$item}-info              { background-color: $infoText; }
-  .#{$item}-info[href]        { background-color: darken($infoText, 10%); }
-  // Inverse (black)
-  .#{$item}-inverse           { background-color: $grayDark; }
-  .#{$item}-inverse[href]     { background-color: darken($grayDark, 10%); }
-}
-
-// Quick fix for labels/badges in buttons
-.btn {
-  .label,
-  .badge {
-    position: relative;
-    top: -1px;
-  }
-}
-.btn-mini {
-  .label,
-  .badge {
-    top: 0;
-  }
-}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_labels.scss b/app/assets/stylesheets/rails_admin/bootstrap/_labels.scss
new file mode 100644
index 0000000000..42ed6ea123
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_labels.scss
@@ -0,0 +1,66 @@
+//
+// Labels
+// --------------------------------------------------
+
+.label {
+  display: inline;
+  padding: .2em .6em .3em;
+  font-size: 75%;
+  font-weight: bold;
+  line-height: 1;
+  color: $label-color;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: baseline;
+  border-radius: .25em;
+
+  // [converter] extracted a& to a.label
+
+  // Empty labels collapse automatically (not available in IE8)
+  &:empty {
+    display: none;
+  }
+
+  // Quick fix for labels in buttons
+  .btn & {
+    position: relative;
+    top: -1px;
+  }
+}
+
+// Add hover effects, but only for links
+a.label {
+  &:hover,
+  &:focus {
+    color: $label-link-hover-color;
+    text-decoration: none;
+    cursor: pointer;
+  }
+}
+
+// Colors
+// Contextual variations (linked labels get darker on :hover)
+
+.label-default {
+  @include label-variant($label-default-bg);
+}
+
+.label-primary {
+  @include label-variant($label-primary-bg);
+}
+
+.label-success {
+  @include label-variant($label-success-bg);
+}
+
+.label-info {
+  @include label-variant($label-info-bg);
+}
+
+.label-warning {
+  @include label-variant($label-warning-bg);
+}
+
+.label-danger {
+  @include label-variant($label-danger-bg);
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_layouts.scss b/app/assets/stylesheets/rails_admin/bootstrap/_layouts.scss
deleted file mode 100755
index 5ea4d0049d..0000000000
--- a/app/assets/stylesheets/rails_admin/bootstrap/_layouts.scss
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-// Layouts
-// --------------------------------------------------
-
-
-// Container (centered, fixed-width layouts)
-.container {
-  @include container-fixed();
-}
-
-// Fluid layouts (left aligned, with sidebar, min- & max-width content)
-.container-fluid {
-  padding-right: $gridGutterWidth;
-  padding-left: $gridGutterWidth;
-  @include clearfix();
-}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_list-group.scss b/app/assets/stylesheets/rails_admin/bootstrap/_list-group.scss
new file mode 100644
index 0000000000..36c297c09b
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_list-group.scss
@@ -0,0 +1,131 @@
+//
+// List groups
+// --------------------------------------------------
+
+
+// Base class
+//
+// Easily usable on <ul>, <ol>, or <div>.
+
+.list-group {
+  // No need to set list-style: none; since .list-group-item is block level
+  margin-bottom: 20px;
+  padding-left: 0; // reset padding because ul and ol
+}
+
+
+// Individual list items
+//
+// Use on `li`s or `div`s within the `.list-group` parent.
+
+.list-group-item {
+  position: relative;
+  display: block;
+  padding: 10px 15px;
+  // Place the border on the list items and negative margin up for better styling
+  margin-bottom: -1px;
+  background-color: $list-group-bg;
+  border: 1px solid $list-group-border;
+
+  // Round the first and last items
+  &:first-child {
+    @include border-top-radius($list-group-border-radius);
+  }
+  &:last-child {
+    margin-bottom: 0;
+    @include border-bottom-radius($list-group-border-radius);
+  }
+
+  // Align badges within list items
+  > .badge {
+    float: right;
+  }
+  > .badge + .badge {
+    margin-right: 5px;
+  }
+}
+
+
+// Linked list items
+//
+// Use anchor elements instead of `li`s or `div`s to create linked list items.
+// Includes an extra `.active` modifier class for showing selected items.
+
+a.list-group-item {
+  color: $list-group-link-color;
+
+  .list-group-item-heading {
+    color: $list-group-link-heading-color;
+  }
+
+  // Hover state
+  &:hover,
+  &:focus {
+    text-decoration: none;
+    color: $list-group-link-hover-color;
+    background-color: $list-group-hover-bg;
+  }
+}
+
+.list-group-item {
+  // Disabled state
+  &.disabled,
+  &.disabled:hover,
+  &.disabled:focus {
+    background-color: $list-group-disabled-bg;
+    color: $list-group-disabled-color;
+
+    // Force color to inherit for custom content
+    .list-group-item-heading {
+      color: inherit;
+    }
+    .list-group-item-text {
+      color: $list-group-disabled-text-color;
+    }
+  }
+
+  // Active class on item itself, not parent
+  &.active,
+  &.active:hover,
+  &.active:focus {
+    z-index: 2; // Place active items above their siblings for proper border styling
+    color: $list-group-active-color;
+    background-color: $list-group-active-bg;
+    border-color: $list-group-active-border;
+
+    // Force color to inherit for custom content
+    .list-group-item-heading,
+    .list-group-item-heading > small,
+    .list-group-item-heading > .small {
+      color: inherit;
+    }
+    .list-group-item-text {
+      color: $list-group-active-text-color;
+    }
+  }
+}
+
+
+// Contextual variants
+//
+// Add modifier classes to change text and background color on individual items.
+// Organizationally, this must come after the `:hover` states.
+
+@include list-group-item-variant(success, $state-success-bg, $state-success-text);
+@include list-group-item-variant(info, $state-info-bg, $state-info-text);
+@include list-group-item-variant(warning, $state-warning-bg, $state-warning-text);
+@include list-group-item-variant(danger, $state-danger-bg, $state-danger-text);
+
+
+// Custom content options
+//
+// Extra classes for creating well-formatted content within `.list-group-item`s.
+
+.list-group-item-heading {
+  margin-top: 0;
+  margin-bottom: 5px;
+}
+.list-group-item-text {
+  margin-bottom: 0;
+  line-height: 1.3;
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_media.scss b/app/assets/stylesheets/rails_admin/bootstrap/_media.scss
old mode 100755
new mode 100644
index e461e446d2..5ad22cd6d5
--- a/app/assets/stylesheets/rails_admin/bootstrap/_media.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_media.scss
@@ -10,7 +10,6 @@
 .media,
 .media-body {
   overflow: hidden;
-  *overflow: visible;
   zoom: 1;
 }
 
@@ -37,11 +36,13 @@
 // Media image alignment
 // -------------------------
 
-.media > .pull-left {
-  margin-right: 10px;
-}
-.media > .pull-right {
-  margin-left: 10px;
+.media {
+  > .pull-left {
+    margin-right: 10px;
+  }
+  > .pull-right {
+    margin-left: 10px;
+  }
 }
 
 
@@ -50,6 +51,6 @@
 
 // Undo default ul/ol styles
 .media-list {
-  margin-left: 0;
+  padding-left: 0;
   list-style: none;
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_mixins.scss b/app/assets/stylesheets/rails_admin/bootstrap/_mixins.scss
old mode 100755
new mode 100644
index 53303aa0de..b565f013a4
--- a/app/assets/stylesheets/rails_admin/bootstrap/_mixins.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_mixins.scss
@@ -1,696 +1,39 @@
-//
 // Mixins
 // --------------------------------------------------
 
-
-// UTILITY MIXINS
-// --------------------------------------------------
-
-// Clearfix
-// --------
-// For clearing floats like a boss h5bp.com/q
-@mixin clearfix {
-  *zoom: 1;
-  &:before,
-  &:after {
-    display: table;
-    content: "";
-    // Fixes Opera/contenteditable bug:
-    // http://nicolasgallagher.com/micro-clearfix-hack/#comment-36952
-    line-height: 0;
-  }
-  &:after {
-    clear: both;
-  }
-}
-
-// Webkit-style focus
-// ------------------
-@mixin tab-focus() {
-  // Default
-  outline: thin dotted #333;
-  // Webkit
-  outline: 5px auto -webkit-focus-ring-color;
-  outline-offset: -2px;
-}
-
-// Center-align a block level element
-// ----------------------------------
-@mixin center-block() {
-  display: block;
-  margin-left: auto;
-  margin-right: auto;
-}
-
-// IE7 inline-block
-// ----------------
-@mixin ie7-inline-block() {
-  *display: inline; /* IE7 inline-block hack */
-  *zoom: 1;
-}
-
-// IE7 likes to collapse whitespace on either side of the inline-block elements.
-// Ems because we're attempting to match the width of a space character. Left
-// version is for form buttons, which typically come after other elements, and
-// right version is for icons, which come before. Applying both is ok, but it will
-// mean that space between those elements will be .6em (~2 space characters) in IE7,
-// instead of the 1 space in other browsers.
-@mixin ie7-restore-left-whitespace() {
-  *margin-left: .3em;
-
-  &:first-child {
-    *margin-left: 0;
-  }
-}
-
-@mixin ie7-restore-right-whitespace() {
-  *margin-right: .3em;
-}
-
-// Sizing shortcuts
-// -------------------------
-@mixin size($height, $width) {
-  width: $width;
-  height: $height;
-}
-@mixin square($size) {
-  @include size($size, $size);
-}
-
-// Placeholder text
-// -------------------------
-@mixin placeholder($color: $placeholderText) {
-  &:-moz-placeholder {
-    color: $color;
-  }
-  &:-ms-input-placeholder {
-    color: $color;
-  }
-  &::-webkit-input-placeholder {
-    color: $color;
-  }
-}
-
-// Text overflow
-// -------------------------
-// Requires inline-block or block for proper styling
-@mixin text-overflow() {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-// CSS image replacement
-// -------------------------
-// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
-@mixin hide-text {
-  font: 0/0 a;
-  color: transparent;
-  text-shadow: none;
-  background-color: transparent;
-  border: 0;
-}
-
-
-// FONTS
-// --------------------------------------------------
-
-@mixin font-family-serif() {
-  font-family: $serifFontFamily;
-}
-@mixin font-family-sans-serif() {
-  font-family: $sansFontFamily;
-}
-@mixin font-family-monospace() {
-  font-family: $monoFontFamily;
-}
-@mixin font-shorthand($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
-  font-size: $size;
-  font-weight: $weight;
-  line-height: $lineHeight;
-}
-@mixin font-serif($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
-  @include font-family-serif();
-  @include font-shorthand($size, $weight, $lineHeight);
-}
-@mixin font-sans-serif($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
-  @include font-family-sans-serif();
-  @include font-shorthand($size, $weight, $lineHeight);
-}
-@mixin font-monospace($size: $baseFontSize, $weight: normal, $lineHeight: $baseLineHeight) {
-  @include font-family-monospace();
-  @include font-shorthand($size, $weight, $lineHeight);
-}
-
-
-// FORMS
-// --------------------------------------------------
-
-// Block level inputs
-@mixin input-block-level {
-  display: block;
-  width: 100%;
-  min-height: $inputHeight; // Make inputs at least the height of their button counterpart (base line-height + padding + border)
-  @include box-sizing(border-box); // Makes inputs behave like true block-level elements
-}
-
-
-
-// Mixin for form field states
-@mixin formFieldState($textColor: #555, $borderColor: #ccc, $backgroundColor: #f5f5f5) {
-  // Set the text color
-  .control-label,
-  .help-block,
-  .help-inline {
-    color: $textColor;
-  }
-  // Style inputs accordingly
-  .checkbox,
-  .radio,
-  input,
-  select,
-  textarea {
-    color: $textColor;
-  }
-  input,
-  select,
-  textarea {
-    border-color: $borderColor;
-    @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
-    &:focus {
-      border-color: darken($borderColor, 10%);
-      @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($borderColor, 20%));
-    }
-  }
-  // Give a small background color for input-prepend/-append
-  .input-prepend .add-on,
-  .input-append .add-on {
-    color: $textColor;
-    background-color: $backgroundColor;
-    border-color: $textColor;
-  }
-}
-
-
-
-// CSS3 PROPERTIES
-// --------------------------------------------------
-
-// Border Radius
-@mixin border-radius($radius) {
-  -webkit-border-radius: $radius;
-     -moz-border-radius: $radius;
-          border-radius: $radius;
-}
-
-// Single Corner Border Radius
-@mixin border-top-left-radius($radius) {
-  -webkit-border-top-left-radius: $radius;
-      -moz-border-radius-topleft: $radius;
-          border-top-left-radius: $radius;
-}
-@mixin border-top-right-radius($radius) {
-  -webkit-border-top-right-radius: $radius;
-      -moz-border-radius-topright: $radius;
-          border-top-right-radius: $radius;
-}
-@mixin border-bottom-right-radius($radius) {
-  -webkit-border-bottom-right-radius: $radius;
-      -moz-border-radius-bottomright: $radius;
-          border-bottom-right-radius: $radius;
-}
-@mixin border-bottom-left-radius($radius) {
-  -webkit-border-bottom-left-radius: $radius;
-      -moz-border-radius-bottomleft: $radius;
-          border-bottom-left-radius: $radius;
-}
-
-// Single Side Border Radius
-@mixin border-top-radius($radius) {
-  @include border-top-right-radius($radius);
-  @include border-top-left-radius($radius);
-}
-@mixin border-right-radius($radius) {
-  @include border-top-right-radius($radius);
-  @include border-bottom-right-radius($radius);
-}
-@mixin border-bottom-radius($radius) {
-  @include border-bottom-right-radius($radius);
-  @include border-bottom-left-radius($radius);
-}
-@mixin border-left-radius($radius) {
-  @include border-top-left-radius($radius);
-  @include border-bottom-left-radius($radius);
-}
-
-// Drop shadows
-@mixin box-shadow($shadow...) {
-  -webkit-box-shadow: $shadow;
-     -moz-box-shadow: $shadow;
-          box-shadow: $shadow;
-}
-
-// Transitions
-@mixin transition($transition...) {
-  -webkit-transition: $transition;
-     -moz-transition: $transition;
-       -o-transition: $transition;
-          transition: $transition;
-}
-@mixin transition-delay($transition-delay) {
-  -webkit-transition-delay: $transition-delay;
-     -moz-transition-delay: $transition-delay;
-       -o-transition-delay: $transition-delay;
-          transition-delay: $transition-delay;
-}
-@mixin transition-duration($transition-duration) {
-  -webkit-transition-duration: $transition-duration;
-     -moz-transition-duration: $transition-duration;
-       -o-transition-duration: $transition-duration;
-          transition-duration: $transition-duration;
-}
-
-// Transformations
-@mixin rotate($degrees) {
-  -webkit-transform: rotate($degrees);
-     -moz-transform: rotate($degrees);
-      -ms-transform: rotate($degrees);
-       -o-transform: rotate($degrees);
-          transform: rotate($degrees);
-}
-@mixin scale($ratio) {
-  -webkit-transform: scale($ratio);
-     -moz-transform: scale($ratio);
-      -ms-transform: scale($ratio);
-       -o-transform: scale($ratio);
-          transform: scale($ratio);
-}
-@mixin translate($x, $y) {
-  -webkit-transform: translate($x, $y);
-     -moz-transform: translate($x, $y);
-      -ms-transform: translate($x, $y);
-       -o-transform: translate($x, $y);
-          transform: translate($x, $y);
-}
-@mixin skew($x, $y) {
-  -webkit-transform: skew($x, $y);
-     -moz-transform: skew($x, $y);
-      -ms-transform: skewX($x) skewY($y); // See https://github.com/twitter/bootstrap/issues/4885
-       -o-transform: skew($x, $y);
-          transform: skew($x, $y);
-  -webkit-backface-visibility: hidden; // See https://github.com/twitter/bootstrap/issues/5319
-}
-@mixin translate3d($x, $y, $z) {
-  -webkit-transform: translate3d($x, $y, $z);
-     -moz-transform: translate3d($x, $y, $z);
-       -o-transform: translate3d($x, $y, $z);
-          transform: translate3d($x, $y, $z);
-}
-
-// Backface visibility
-// Prevent browsers from flickering when using CSS 3D transforms.
-// Default value is `visible`, but can be changed to `hidden
-// See git pull https://github.com/dannykeane/bootstrap.git backface-visibility for examples
-@mixin backface-visibility($visibility){
-  -webkit-backface-visibility: $visibility;
-     -moz-backface-visibility: $visibility;
-          backface-visibility: $visibility;
-}
-
-// Background clipping
-// Heads up: FF 3.6 and under need "padding" instead of "padding-box"
-@mixin background-clip($clip) {
-  -webkit-background-clip: $clip;
-     -moz-background-clip: $clip;
-          background-clip: $clip;
-}
-
-// Background sizing
-@mixin background-size($size) {
-  -webkit-background-size: $size;
-     -moz-background-size: $size;
-       -o-background-size: $size;
-          background-size: $size;
-}
-
-
-// Box sizing
-@mixin box-sizing($boxmodel) {
-  -webkit-box-sizing: $boxmodel;
-     -moz-box-sizing: $boxmodel;
-          box-sizing: $boxmodel;
-}
-
-// User select
-// For selecting text on the page
-@mixin user-select($select) {
-  -webkit-user-select: $select;
-     -moz-user-select: $select;
-      -ms-user-select: $select;
-       -o-user-select: $select;
-          user-select: $select;
-}
-
-// Resize anything
-@mixin resizable($direction) {
-  resize: $direction; // Options: horizontal, vertical, both
-  overflow: auto; // Safari fix
-}
-
-// CSS3 Content Columns
-@mixin content-columns($columnCount, $columnGap: $gridGutterWidth) {
-  -webkit-column-count: $columnCount;
-     -moz-column-count: $columnCount;
-          column-count: $columnCount;
-  -webkit-column-gap: $columnGap;
-     -moz-column-gap: $columnGap;
-          column-gap: $columnGap;
-}
-
-// Optional hyphenation
-@mixin hyphens($mode: auto) {
-  word-wrap: break-word;
-  -webkit-hyphens: $mode;
-     -moz-hyphens: $mode;
-      -ms-hyphens: $mode;
-       -o-hyphens: $mode;
-          hyphens: $mode;
-}
-
-// Opacity
-@mixin opacity($opacity) {
-  opacity: $opacity / 100;
-  filter: alpha(opacity=$opacity);
-}
-
-
-
-// BACKGROUNDS
-// --------------------------------------------------
-
-// Add an alphatransparency value to any background or border color (via Elyse Holladay)
-@mixin translucent-background($color: $white, $alpha: 1) {
-  background-color: hsla(hue($color), saturation($color), lightness($color), $alpha);
-}
-
-@mixin translucent-border($color: $white, $alpha: 1) {
-  border-color: hsla(hue($color), saturation($color), lightness($color), $alpha);
-  @include background-clip(padding-box);
-}
-
-// Gradient Bar Colors for buttons and alerts
-@mixin gradientBar($primaryColor, $secondaryColor, $textColor: #fff, $textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
-  color: $textColor;
-  text-shadow: $textShadow;
-  @include gradient-vertical($primaryColor, $secondaryColor);
-  border-color: $secondaryColor $secondaryColor darken($secondaryColor, 15%);
-  border-color: rgba(0,0,0,.1) rgba(0,0,0,.1) fade-in(rgba(0,0,0,.1), 0.15);
-}
-
-// Gradients
-@mixin gradient-horizontal($startColor: #555, $endColor: #333) {
-  background-color: $endColor;
-  background-image: -moz-linear-gradient(left, $startColor, $endColor); // FF 3.6+
-  background-image: -webkit-gradient(linear, 0 0, 100% 0, from($startColor), to($endColor)); // Safari 4+, Chrome 2+
-  background-image: -webkit-linear-gradient(left, $startColor, $endColor); // Safari 5.1+, Chrome 10+
-  background-image: -o-linear-gradient(left, $startColor, $endColor); // Opera 11.10
-  background-image: linear-gradient(to right, $startColor, $endColor); // Standard, IE10
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=1); // IE9 and down
-}
-@mixin gradient-vertical($startColor: #555, $endColor: #333) {
-  background-color: mix($startColor, $endColor, 60%);
-  background-image: -moz-linear-gradient(top, $startColor, $endColor); // FF 3.6+
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), to($endColor)); // Safari 4+, Chrome 2+
-  background-image: -webkit-linear-gradient(top, $startColor, $endColor); // Safari 5.1+, Chrome 10+
-  background-image: -o-linear-gradient(top, $startColor, $endColor); // Opera 11.10
-  background-image: linear-gradient(to bottom, $startColor, $endColor); // Standard, IE10
-  background-repeat: repeat-x;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=0); // IE9 and down
-}
-@mixin gradient-directional($startColor: #555, $endColor: #333, $deg: 45deg) {
-  background-color: $endColor;
-  background-repeat: repeat-x;
-  background-image: -moz-linear-gradient($deg, $startColor, $endColor); // FF 3.6+
-  background-image: -webkit-linear-gradient($deg, $startColor, $endColor); // Safari 5.1+, Chrome 10+
-  background-image: -o-linear-gradient($deg, $startColor, $endColor); // Opera 11.10
-  background-image: linear-gradient($deg, $startColor, $endColor); // Standard, IE10
-}
-@mixin gradient-horizontal-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f) {
-  background-color: mix($midColor, $endColor, 80%);
-  background-image: -webkit-gradient(left, linear, 0 0, 0 100%, from($startColor), color-stop($colorStop, $midColor), to($endColor));
-  background-image: -webkit-linear-gradient(left, $startColor, $midColor $colorStop, $endColor);
-  background-image: -moz-linear-gradient(left, $startColor, $midColor $colorStop, $endColor);
-  background-image: -o-linear-gradient(left, $startColor, $midColor $colorStop, $endColor);
-  background-image: linear-gradient(to right, $startColor, $midColor $colorStop, $endColor);
-  background-repeat: no-repeat;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback
-}
-
-@mixin gradient-vertical-three-colors($startColor: #00b3ee, $midColor: #7a43b6, $colorStop: 50%, $endColor: #c3325f) {
-  background-color: mix($midColor, $endColor, 80%);
-  background-image: -webkit-gradient(linear, 0 0, 0 100%, from($startColor), color-stop($colorStop, $midColor), to($endColor));
-  background-image: -webkit-linear-gradient($startColor, $midColor $colorStop, $endColor);
-  background-image: -moz-linear-gradient(top, $startColor, $midColor $colorStop, $endColor);
-  background-image: -o-linear-gradient($startColor, $midColor $colorStop, $endColor);
-  background-image: linear-gradient($startColor, $midColor $colorStop, $endColor);
-  background-repeat: no-repeat;
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($startColor)}', endColorstr='#{ie-hex-str($endColor)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback
-}
-@mixin gradient-radial($innerColor: #555, $outerColor: #333)  {
-  background-color: $outerColor;
-  background-image: -webkit-gradient(radial, center center, 0, center center, 460, from($innerColor), to($outerColor));
-  background-image: -webkit-radial-gradient(circle, $innerColor, $outerColor);
-  background-image: -moz-radial-gradient(circle, $innerColor, $outerColor);
-  background-image: -o-radial-gradient(circle, $innerColor, $outerColor);
-  background-repeat: no-repeat;
-}
-@mixin gradient-striped($color: #555, $angle: 45deg) {
-  background-color: $color;
-  background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent));
-  background-image: -webkit-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-  background-image: -moz-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-  background-image: -o-linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-  background-image: linear-gradient($angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent);
-}
-
-// Reset filters for IE
-@mixin reset-filter() {
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-
-
-
-// COMPONENT MIXINS
-// --------------------------------------------------
-
-// Horizontal dividers
-// -------------------------
-// Dividers (basically an hr) within dropdowns and nav lists
-@mixin nav-divider($top: #e5e5e5, $bottom: $white) {
-  // IE7 needs a set width since we gave a height. Restricting just
-  // to IE7 to keep the 1px left/right space in other browsers.
-  // It is unclear where IE is getting the extra space that we need
-  // to negative-margin away, but so it goes.
-  *width: 100%;
-  height: 1px;
-  margin: (($baseLineHeight / 2) - 1) 1px; // 8px 1px
-  *margin: -5px 0 5px;
-  overflow: hidden;
-  background-color: $top;
-  border-bottom: 1px solid $bottom;
-}
-
-// Button backgrounds
-// ------------------
-@mixin buttonBackground($startColor, $endColor, $textColor: #fff, $textShadow: 0 -1px 0 rgba(0,0,0,.25)) {
-  // gradientBar will set the background to a pleasing blend of these, to support IE<=9
-  @include gradientBar($startColor, $endColor, $textColor, $textShadow);
-  *background-color: $endColor; /* Darken IE7 buttons by default so they stand out more given they won't have borders */
-  @include reset-filter();
-
-  // in these cases the gradient won't cover the background, so we override
-  &:hover, &:focus, &:active, &.active, &.disabled, &[disabled] {
-    color: $textColor;
-    background-color: $endColor;
-    *background-color: darken($endColor, 5%);
-  }
-
-  // IE 7 + 8 can't handle box-shadow to show active, so we darken a bit ourselves
-  &:active,
-  &.active {
-    background-color: darken($endColor, 10%) \9;
-  }
-}
-
-// Navbar vertical align
-// -------------------------
-// Vertically center elements in the navbar.
-// Example: an element has a height of 30px, so write out `.navbarVerticalAlign(30px);` to calculate the appropriate top margin.
-@mixin navbarVerticalAlign($elementHeight) {
-  margin-top: ($navbarHeight - $elementHeight) / 2;
-}
-
-
-
-// Grid System
-// -----------
-
-// Centered container element
-@mixin container-fixed() {
-  margin-right: auto;
-  margin-left: auto;
-  @include clearfix();
-}
-
-// Table columns
-@mixin tableColumns($columnSpan: 1) {
-  float: none; // undo default grid column styles
-  width: (($gridColumnWidth) * $columnSpan) + ($gridGutterWidth * ($columnSpan - 1)) - 16; // 16 is total padding on left and right of table cells
-  margin-left: 0; // undo default grid column styles
-}
-
-// Make a Grid
-// Use .makeRow and .makeColumn to assign semantic layouts grid system behavior
-@mixin makeRow() {
-  margin-left: $gridGutterWidth * -1;
-  @include clearfix();
-}
-@mixin makeColumn($columns: 1, $offset: 0) {
-  float: left;
-  margin-left: ($gridColumnWidth * $offset) + ($gridGutterWidth * ($offset - 1)) + ($gridGutterWidth * 2);
-  width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1));
-}
-
-// The Grid
-@mixin grid-core($gridColumnWidth, $gridGutterWidth) {
-  .row {
-    margin-left: $gridGutterWidth * -1;
-    @include clearfix();
-  }
-
-  [class*="span"] {
-    float: left;
-    min-height: 1px; // prevent collapsing columns
-    margin-left: $gridGutterWidth;
-  }
-
-  // Set the container width, and override it for fixed navbars in media queries
-  .container,
-  .navbar-static-top .container,
-  .navbar-fixed-top .container,
-  .navbar-fixed-bottom .container {
-    @include grid-core-span($gridColumns, $gridColumnWidth, $gridGutterWidth);
-  }
-
-  // generate .spanX and .offsetX
-  @include grid-core-span-x($gridColumns, $gridColumnWidth, $gridGutterWidth);
-  @include grid-core-offset-x($gridColumns, $gridColumnWidth, $gridGutterWidth);
-}
-
-@mixin grid-core-span-x($gridColumns, $gridColumnWidth, $gridGutterWidth) {
-  @for $i from 1 through $gridColumns {
-    .span#{$i} { @include grid-core-span($i, $gridColumnWidth, $gridGutterWidth); }
-  }
-}
-
-@mixin grid-core-offset-x($gridColumns, $gridColumnWidth, $gridGutterWidth) {
-  @for $i from 1 through $gridColumns {
-    .offset#{$i} { @include grid-core-offset($i, $gridColumnWidth, $gridGutterWidth); }
-  }
-}
-
-@mixin grid-core-span($columns, $gridColumnWidth, $gridGutterWidth) {
-  width: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns - 1));
-}
-
-@mixin grid-core-offset($columns, $gridColumnWidth, $gridGutterWidth) {
-  margin-left: ($gridColumnWidth * $columns) + ($gridGutterWidth * ($columns + 1));
-}
-
-
-
-@mixin grid-fluid($fluidGridColumnWidth, $fluidGridGutterWidth) {
-  .row-fluid {
-    width: 100%;
-    @include clearfix();
-    [class*="span"] {
-      @include input-block-level();
-      float: left;
-      margin-left: $fluidGridGutterWidth;
-      *margin-left: $fluidGridGutterWidth - (.5 / $gridRowWidth * 100px * 1%);
-    }
-    [class*="span"]:first-child {
-      margin-left: 0;
-    }
-
-    // Space grid-sized controls properly if multiple per line
-    .controls-row [class*="span"] + [class*="span"] {
-      margin-left: $fluidGridGutterWidth;
-    }
-
-    // generate .spanX and .offsetX
-    @include grid-fluid-span-x($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth);
-    @include grid-fluid-offset-x($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth);
-  }
-}
-
-@mixin grid-fluid-span-x($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
-  @for $i from 1 through $gridColumns {
-    .span#{$i} { @include grid-fluid-span($i, $fluidGridColumnWidth, $fluidGridGutterWidth); }
-  }
-}
-
-@mixin grid-fluid-offset-x($gridColumns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
-  @for $i from 1 through $gridColumns {
-    .offset#{$i} { @include grid-fluid-offset($i, $fluidGridColumnWidth, $fluidGridGutterWidth); }
-    .offset#{$i}:first-child { @include grid-fluid-offset-first-child($i, $fluidGridColumnWidth, $fluidGridGutterWidth); }
-  }
-}
-
-@mixin grid-fluid-span($columns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
-  width: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1));
-  *width: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1)) - (.5 / $gridRowWidth * 100px * 1%);
-}
-
-@mixin grid-fluid-offset($columns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
-  margin-left: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1)) + ($fluidGridGutterWidth * 2);
-  *margin-left: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1)) - (.5 / $gridRowWidth * 100px * 1%) + ($fluidGridGutterWidth * 2) - (.5 / $gridRowWidth * 100px * 1%);
-}
-
-@mixin grid-fluid-offset-first-child($columns, $fluidGridColumnWidth, $fluidGridGutterWidth) {
-  margin-left: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1)) + ($fluidGridGutterWidth);
-  *margin-left: ($fluidGridColumnWidth * $columns) + ($fluidGridGutterWidth * ($columns - 1)) - (.5 / $gridRowWidth * 100px * 1%) + $fluidGridGutterWidth - (.5 / $gridRowWidth * 100px * 1%);
-}
-
-
-
-@mixin grid-input($gridColumnWidth, $gridGutterWidth) {
-  input,
-  textarea,
-  .uneditable-input {
-    margin-left: 0; // override margin-left from core grid system
-  }
-
-  // Space grid-sized controls properly if multiple per line
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: $gridGutterWidth;
-  }
-
-  // generate .spanX
-  @include grid-input-span-x($gridColumns, $gridColumnWidth, $gridGutterWidth);
-}
-
-@mixin grid-input-span-x($gridColumns, $gridColumnWidth, $gridGutterWidth) {
-  @for $i from 1 through $gridColumns {
-    input.span#{$i},
-    textarea.span#{$i},
-    .uneditable-input.span#{$i} {
-      @include grid-input-span($i, $gridColumnWidth, $gridGutterWidth);
-    }
-  }
-}
-
-@mixin grid-input-span($columns, $gridColumnWidth, $gridGutterWidth) {
-  width: (($gridColumnWidth) * $columns) + ($gridGutterWidth * ($columns - 1)) - 14;
-}
+// Utilities
+@import "mixins/hide-text";
+@import "mixins/opacity";
+@import "mixins/image";
+@import "mixins/labels";
+@import "mixins/reset-filter";
+@import "mixins/resize";
+@import "mixins/responsive-visibility";
+@import "mixins/size";
+@import "mixins/tab-focus";
+@import "mixins/text-emphasis";
+@import "mixins/text-overflow";
+@import "mixins/vendor-prefixes";
+
+// Components
+@import "mixins/alerts";
+@import "mixins/buttons";
+@import "mixins/panels";
+@import "mixins/pagination";
+@import "mixins/list-group";
+@import "mixins/nav-divider";
+@import "mixins/forms";
+@import "mixins/progress-bar";
+@import "mixins/table-row";
+
+// Skins
+@import "mixins/background-variant";
+@import "mixins/border-radius";
+@import "mixins/gradients";
+
+// Layout
+@import "mixins/clearfix";
+@import "mixins/center-block";
+@import "mixins/nav-vertical-align";
+@import "mixins/grid-framework";
+@import "mixins/grid";
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_modals.scss b/app/assets/stylesheets/rails_admin/bootstrap/_modals.scss
old mode 100755
new mode 100644
index 749baa6a87..785ca5c8ff
--- a/app/assets/stylesheets/rails_admin/bootstrap/_modals.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_modals.scss
@@ -2,81 +2,108 @@
 // Modals
 // --------------------------------------------------
 
-// Background
-.modal-backdrop {
+// .modal-open      - body class for killing the scroll
+// .modal           - container to scroll within
+// .modal-dialog    - positioning shell for the actual modal
+// .modal-content   - actual modal w/ bg and corners and shit
+
+// Kill the scroll on the body
+.modal-open {
+  overflow: hidden;
+}
+
+// Container that the modal scrolls within
+.modal {
+  display: none;
+  overflow: hidden;
   position: fixed;
   top: 0;
   right: 0;
   bottom: 0;
   left: 0;
-  z-index: $zindexModalBackdrop;
-  background-color: $black;
-  // Fade for backdrop
-  &.fade { opacity: 0; }
+  z-index: $zindex-modal;
+  -webkit-overflow-scrolling: touch;
+
+  // Prevent Chrome on Windows from adding a focus outline. For details, see
+  // https://github.com/twbs/bootstrap/pull/10951.
+  outline: 0;
+
+  // When fading in the modal, animate it to slide down
+  &.fade .modal-dialog {
+    @include translate3d(0, -25%, 0);
+    @include transition-transform(0.3s ease-out);
+  }
+  &.in .modal-dialog { @include translate3d(0, 0, 0) }
+}
+.modal-open .modal {
+  overflow-x: hidden;
+  overflow-y: auto;
 }
 
-.modal-backdrop,
-.modal-backdrop.fade.in {
-  @include opacity(80);
+// Shell div to position the modal with bottom padding
+.modal-dialog {
+  position: relative;
+  width: auto;
+  margin: 10px;
 }
 
-// Base modal
-.modal {
-  position: fixed;
-  top: 10%;
-  left: 50%;
-  z-index: $zindexModal;
-  width: 560px;
-  margin-left: -280px;
-  background-color: $white;
-  border: 1px solid #999;
-  border: 1px solid rgba(0,0,0,.3);
-  *border: 1px solid #999; /* IE6-7 */
-  @include border-radius(6px);
-  @include box-shadow(0 3px 7px rgba(0,0,0,0.3));
-  @include background-clip(padding-box);
+// Actual modal
+.modal-content {
+  position: relative;
+  background-color: $modal-content-bg;
+  border: 1px solid $modal-content-fallback-border-color; //old browsers fallback (ie8 etc)
+  border: 1px solid $modal-content-border-color;
+  border-radius: $border-radius-large;
+  @include box-shadow(0 3px 9px rgba(0,0,0,.5));
+  background-clip: padding-box;
   // Remove focus outline from opened modal
-  outline: none;
+  outline: 0;
+}
 
-  &.fade {
-    @include transition(opacity .3s linear, top .3s ease-out);
-    top: -25%;
-  }
-  &.fade.in { top: 10%; }
+// Modal background
+.modal-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: $zindex-modal-background;
+  background-color: $modal-backdrop-bg;
+  // Fade for backdrop
+  &.fade { @include opacity(0); }
+  &.in { @include opacity($modal-backdrop-opacity); }
 }
+
+// Modal header
+// Top section of the modal w/ title and dismiss
 .modal-header {
-  padding: 9px 15px;
-  border-bottom: 1px solid #eee;
-  // Close icon
-  .close { margin-top: 2px; }
-  // Heading
-  h3 {
-    margin: 0;
-    line-height: 30px;
-  }
+  padding: $modal-title-padding;
+  border-bottom: 1px solid $modal-header-border-color;
+  min-height: ($modal-title-padding + $modal-title-line-height);
+}
+// Close icon
+.modal-header .close {
+  margin-top: -2px;
 }
 
-// Body (where all modal content resides)
+// Title text within header
+.modal-title {
+  margin: 0;
+  line-height: $modal-title-line-height;
+}
+
+// Modal body
+// Where all modal content resides (sibling of .modal-header and .modal-footer)
 .modal-body {
   position: relative;
-  overflow-y: auto;
-  max-height: 400px;
-  padding: 15px;
-}
-// Remove bottom margin if need be
-.modal-form {
-  margin-bottom: 0;
+  padding: $modal-inner-padding;
 }
 
 // Footer (for actions)
 .modal-footer {
-  padding: 14px 15px 15px;
-  margin-bottom: 0;
+  padding: $modal-inner-padding;
   text-align: right; // right align buttons
-  background-color: #f5f5f5;
-  border-top: 1px solid #ddd;
-  @include border-radius(0 0 6px 6px);
-  @include box-shadow(inset 0 1px 0 $white);
+  border-top: 1px solid $modal-footer-border-color;
   @include clearfix(); // clear it in case folks use .pull-* classes on buttons
 
   // Properly space out buttons
@@ -93,3 +120,31 @@
     margin-left: 0;
   }
 }
+
+// Measure scrollbar width for padding body during modal show/hide
+.modal-scrollbar-measure {
+  position: absolute;
+  top: -9999px;
+  width: 50px;
+  height: 50px;
+  overflow: scroll;
+}
+
+// Scale up the modal
+@media (min-width: $screen-sm-min) {
+  // Automatically set modal's width for larger viewports
+  .modal-dialog {
+    width: $modal-md;
+    margin: 30px auto;
+  }
+  .modal-content {
+    @include box-shadow(0 5px 15px rgba(0,0,0,.5));
+  }
+
+  // Modal sizes
+  .modal-sm { width: $modal-sm; }
+}
+
+@media (min-width: $screen-md-min) {
+  .modal-lg { width: $modal-lg; }
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_navbar.scss b/app/assets/stylesheets/rails_admin/bootstrap/_navbar.scss
old mode 100755
new mode 100644
index a65aa4abef..3b94d6f3d1
--- a/app/assets/stylesheets/rails_admin/bootstrap/_navbar.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_navbar.scss
@@ -1,497 +1,659 @@
 //
-// Navbars (Redux)
+// Navbars
 // --------------------------------------------------
 
 
-// COMMON STYLES
-// -------------
+// Wrapper and base class
+//
+// Provide a static navbar from which we expand to create full-width, fixed, and
+// other navbar variations.
 
-// Base class and wrapper
 .navbar {
-  overflow: visible;
-  margin-bottom: $baseLineHeight;
-
-  // Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar
-  *position: relative;
-  *z-index: 2;
-}
-
-// Inner for background effects
-// Gradient is applied to its own element because overflow visible is not honored by IE when filter is present
-.navbar-inner {
-  min-height: $navbarHeight;
-  padding-left:  20px;
-  padding-right: 20px;
-  @include gradient-vertical($navbarBackgroundHighlight, $navbarBackground);
-  border: 1px solid $navbarBorder;
-  @include border-radius($baseBorderRadius);
-  @include box-shadow(0 1px 4px rgba(0,0,0,.065));
+  position: relative;
+  min-height: $navbar-height; // Ensure a navbar always shows (e.g., without a .navbar-brand in collapsed mode)
+  margin-bottom: $navbar-margin-bottom;
+  border: 1px solid transparent;
 
   // Prevent floats from breaking the navbar
   @include clearfix();
-}
 
-// Set width to auto for default container
-// We then reset it for fixed navbars in the #gridSystem mixin
-.navbar .container {
-  width: auto;
+  @media (min-width: $grid-float-breakpoint) {
+    border-radius: $navbar-border-radius;
+  }
 }
 
-// Override the default collapsed state
-.nav-collapse.collapse {
-  height: auto;
-  overflow: visible;
-}
 
+// Navbar heading
+//
+// Groups `.navbar-brand` and `.navbar-toggle` into a single component for easy
+// styling of responsive aspects.
 
-// Brand: website or project name
-// -------------------------
-.navbar .brand {
-  float: left;
-  display: block;
-  // Vertically center the text given $navbarHeight
-  padding: (($navbarHeight - $baseLineHeight) / 2) 20px (($navbarHeight - $baseLineHeight) / 2);
-  margin-left: -20px; // negative indent to left-align the text down the page
-  font-size: 20px;
-  font-weight: 200;
-  color: $navbarBrandColor;
-  text-shadow: 0 1px 0 $navbarBackgroundHighlight;
-  &:hover,
-  &:focus {
-    text-decoration: none;
+.navbar-header {
+  @include clearfix();
+
+  @media (min-width: $grid-float-breakpoint) {
+    float: left;
   }
 }
 
-// Plain text in topbar
-// -------------------------
-.navbar-text {
-  margin-bottom: 0;
-  line-height: $navbarHeight;
-  color: $navbarText;
-}
 
-// Janky solution for now to account for links outside the .nav
-// -------------------------
-.navbar-link {
-  color: $navbarLinkColor;
-  &:hover,
-  &:focus {
-    color: $navbarLinkColorHover;
+// Navbar collapse (body)
+//
+// Group your navbar content into this for easy collapsing and expanding across
+// various device sizes. By default, this content is collapsed when <768px, but
+// will expand past that for a horizontal display.
+//
+// To start (on mobile devices) the navbar links, forms, and buttons are stacked
+// vertically and include a `max-height` to overflow in case you have too much
+// content for the user's viewport.
+
+.navbar-collapse {
+  overflow-x: visible;
+  padding-right: $navbar-padding-horizontal;
+  padding-left:  $navbar-padding-horizontal;
+  border-top: 1px solid transparent;
+  box-shadow: inset 0 1px 0 rgba(255,255,255,.1);
+  @include clearfix();
+  -webkit-overflow-scrolling: touch;
+
+  &.in {
+    overflow-y: auto;
   }
-}
 
-// Dividers in navbar
-// -------------------------
-.navbar .divider-vertical {
-  height: $navbarHeight;
-  margin: 0 9px;
-  border-left: 1px solid $navbarBackground;
-  border-right: 1px solid $navbarBackgroundHighlight;
-}
+  @media (min-width: $grid-float-breakpoint) {
+    width: auto;
+    border-top: 0;
+    box-shadow: none;
 
-// Buttons in navbar
-// -------------------------
-.navbar .btn,
-.navbar .btn-group {
-  @include navbarVerticalAlign(30px); // Vertically center in navbar
-}
-.navbar .btn-group .btn,
-.navbar .input-prepend .btn,
-.navbar .input-append .btn,
-.navbar .input-prepend .btn-group,
-.navbar .input-append .btn-group {
-  margin-top: 0; // then undo the margin here so we don't accidentally double it
-}
+    &.collapse {
+      display: block !important;
+      height: auto !important;
+      padding-bottom: 0; // Override default setting
+      overflow: visible !important;
+    }
 
-// Navbar forms
-// -------------------------
-.navbar-form {
-  margin-bottom: 0; // remove default bottom margin
-  @include clearfix();
-  input,
-  select,
-  .radio,
-  .checkbox {
-    @include navbarVerticalAlign(30px); // Vertically center in navbar
-  }
-  input,
-  select,
-  .btn {
-    display: inline-block;
-    margin-bottom: 0;
-  }
-  input[type="image"],
-  input[type="checkbox"],
-  input[type="radio"] {
-    margin-top: 3px;
-  }
-  .input-append,
-  .input-prepend {
-    margin-top: 5px;
-    white-space: nowrap; // preven two  items from separating within a .navbar-form that has .pull-left
-    input {
-      margin-top: 0; // remove the margin on top since it's on the parent
+    &.in {
+      overflow-y: visible;
     }
-  }
-}
 
-// Navbar search
-// -------------------------
-.navbar-search {
-  position: relative;
-  float: left;
-  @include navbarVerticalAlign(30px); // Vertically center in navbar
-  margin-bottom: 0;
-  .search-query {
-    margin-bottom: 0;
-    padding: 4px 14px;
-    @include font-sans-serif(13px, normal, 1);
-    @include border-radius(15px); // redeclare because of specificity of the type attribute
+    // Undo the collapse side padding for navbars with containers to ensure
+    // alignment of right-aligned contents.
+    .navbar-fixed-top &,
+    .navbar-static-top &,
+    .navbar-fixed-bottom & {
+      padding-left: 0;
+      padding-right: 0;
+    }
   }
 }
 
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  .navbar-collapse {
+    max-height: $navbar-collapse-max-height;
 
+    @media (max-width: $screen-xs-min) and (orientation: landscape) {
+      max-height: 200px;
+    }
+  }
+}
 
-// Static navbar
-// -------------------------
 
-.navbar-static-top {
-  position: static;
-  margin-bottom: 0; // remove 18px margin for default navbar
-  .navbar-inner {
-    @include border-radius(0);
+// Both navbar header and collapse
+//
+// When a container is present, change the behavior of the header and collapse.
+
+.container,
+.container-fluid {
+  > .navbar-header,
+  > .navbar-collapse {
+    margin-right: -$navbar-padding-horizontal;
+    margin-left:  -$navbar-padding-horizontal;
+
+    @media (min-width: $grid-float-breakpoint) {
+      margin-right: 0;
+      margin-left:  0;
+    }
   }
 }
 
 
+//
+// Navbar alignment options
+//
+// Display the navbar across the entirety of the page or fixed it to the top or
+// bottom of the page.
 
-// Fixed navbar
-// -------------------------
+// Static top (unfixed, but 100% wide) navbar
+.navbar-static-top {
+  z-index: $zindex-navbar;
+  border-width: 0 0 1px;
 
-// Shared (top/bottom) styles
+  @media (min-width: $grid-float-breakpoint) {
+    border-radius: 0;
+  }
+}
+
+// Fix the top/bottom navbars when screen real estate supports it
 .navbar-fixed-top,
 .navbar-fixed-bottom {
   position: fixed;
   right: 0;
   left: 0;
-  z-index: $zindexFixedNavbar;
-  margin-bottom: 0; // remove 18px margin for default navbar
+  z-index: $zindex-navbar-fixed;
+  @include translate3d(0, 0, 0);
+
+  // Undo the rounded corners
+  @media (min-width: $grid-float-breakpoint) {
+    border-radius: 0;
+  }
 }
-.navbar-fixed-top .navbar-inner,
-.navbar-static-top .navbar-inner {
+.navbar-fixed-top {
+  top: 0;
   border-width: 0 0 1px;
 }
-.navbar-fixed-bottom .navbar-inner {
+.navbar-fixed-bottom {
+  bottom: 0;
+  margin-bottom: 0; // override .navbar defaults
   border-width: 1px 0 0;
 }
-.navbar-fixed-top .navbar-inner,
-.navbar-fixed-bottom .navbar-inner {
-  padding-left:  0;
-  padding-right: 0;
-  @include border-radius(0);
-}
 
-// Reset container width
-// Required here as we reset the width earlier on and the grid mixins don't override early enough
-.navbar-static-top .container,
-.navbar-fixed-top .container,
-.navbar-fixed-bottom .container {
-  @include grid-core-span($gridColumns, $gridColumnWidth, $gridGutterWidth);
-}
 
-// Fixed to top
-.navbar-fixed-top {
-  top: 0;
-}
-.navbar-fixed-top,
-.navbar-static-top {
-  .navbar-inner {
-    @include box-shadow(0 1px 10px rgba(0,0,0,.1));
+// Brand/project name
+
+.navbar-brand {
+  float: left;
+  padding: $navbar-padding-vertical $navbar-padding-horizontal;
+  font-size: $font-size-large;
+  line-height: $line-height-computed;
+  height: $navbar-height;
+
+  &:hover,
+  &:focus {
+    text-decoration: none;
   }
-}
 
-// Fixed to bottom
-.navbar-fixed-bottom {
-  bottom: 0;
-  .navbar-inner {
-    @include box-shadow(0 -1px 10px rgba(0,0,0,.1));
+  @media (min-width: $grid-float-breakpoint) {
+    .navbar > .container &,
+    .navbar > .container-fluid & {
+      margin-left: -$navbar-padding-horizontal;
+    }
   }
 }
 
 
+// Navbar toggle
+//
+// Custom button for toggling the `.navbar-collapse`, powered by the collapse
+// JavaScript plugin.
 
-// NAVIGATION
-// ----------
-
-.navbar .nav {
+.navbar-toggle {
   position: relative;
-  left: 0;
-  display: block;
-  float: left;
-  margin: 0 10px 0 0;
-}
-.navbar .nav.pull-right {
-  float: right; // redeclare due to specificity
-  margin-right: 0; // remove margin on float right nav
-}
-.navbar .nav > li {
-  float: left;
-}
+  float: right;
+  margin-right: $navbar-padding-horizontal;
+  padding: 9px 10px;
+  @include navbar-vertical-align(34px);
+  background-color: transparent;
+  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
+  border: 1px solid transparent;
+  border-radius: $border-radius-base;
+
+  // We remove the `outline` here, but later compensate by attaching `:hover`
+  // styles to `:focus`.
+  &:focus {
+    outline: 0;
+  }
 
-// Links
-.navbar .nav > li > a {
-  float: none;
-  // Vertically center the text given $navbarHeight
-  padding: (($navbarHeight - $baseLineHeight) / 2) 15px (($navbarHeight - $baseLineHeight) / 2);
-  color: $navbarLinkColor;
-  text-decoration: none;
-  text-shadow: 0 1px 0 $navbarBackgroundHighlight;
-}
-.navbar .nav .dropdown-toggle .caret {
-  margin-top: 8px;
-}
+  // Bars
+  .icon-bar {
+    display: block;
+    width: 22px;
+    height: 2px;
+    border-radius: 1px;
+  }
+  .icon-bar + .icon-bar {
+    margin-top: 4px;
+  }
 
-// Hover/focus
-.navbar .nav > li > a:focus,
-.navbar .nav > li > a:hover {
-  background-color: $navbarLinkBackgroundHover; // "transparent" is default to differentiate :hover/:focus from .active
-  color: $navbarLinkColorHover;
-  text-decoration: none;
+  @media (min-width: $grid-float-breakpoint) {
+    display: none;
+  }
 }
 
-// Active nav items
-.navbar .nav > .active > a,
-.navbar .nav > .active > a:hover,
-.navbar .nav > .active > a:focus {
-  color: $navbarLinkColorActive;
-  text-decoration: none;
-  background-color: $navbarLinkBackgroundActive;
-  @include box-shadow(inset 0 3px 8px rgba(0,0,0,.125));
-}
 
-// Navbar button for toggling navbar items in responsive layouts
-// These definitions need to come after '.navbar .btn'
-.navbar .btn-navbar {
-  display: none;
-  float: right;
-  padding: 7px 10px;
-  margin-left: 5px;
-  margin-right: 5px;
-  @include buttonBackground(darken($navbarBackgroundHighlight, 5%), darken($navbarBackground, 5%));
-  @include box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.075));
-}
-.navbar .btn-navbar .icon-bar {
-  display: block;
-  width: 18px;
-  height: 2px;
-  background-color: #f5f5f5;
-  @include border-radius(1px);
-  @include box-shadow(0 1px 0 rgba(0,0,0,.25));
+// Navbar nav links
+//
+// Builds on top of the `.nav` components with its own modifier class to make
+// the nav the full height of the horizontal nav (above 768px).
+
+.navbar-nav {
+  margin: ($navbar-padding-vertical / 2) (-$navbar-padding-horizontal);
+
+  > li > a {
+    padding-top:    10px;
+    padding-bottom: 10px;
+    line-height: $line-height-computed;
+  }
+
+  @media (max-width: $grid-float-breakpoint-max) {
+    // Dropdowns get custom display when collapsed
+    .open .dropdown-menu {
+      position: static;
+      float: none;
+      width: auto;
+      margin-top: 0;
+      background-color: transparent;
+      border: 0;
+      box-shadow: none;
+      > li > a,
+      .dropdown-header {
+        padding: 5px 15px 5px 25px;
+      }
+      > li > a {
+        line-height: $line-height-computed;
+        &:hover,
+        &:focus {
+          background-image: none;
+        }
+      }
+    }
+  }
+
+  // Uncollapse the nav
+  @media (min-width: $grid-float-breakpoint) {
+    float: left;
+    margin: 0;
+
+    > li {
+      float: left;
+      > a {
+        padding-top:    $navbar-padding-vertical;
+        padding-bottom: $navbar-padding-vertical;
+      }
+    }
+
+    &.navbar-right:last-child {
+      margin-right: -$navbar-padding-horizontal;
+    }
+  }
 }
-.btn-navbar .icon-bar + .icon-bar {
-  margin-top: 3px;
+
+
+// Component alignment
+//
+// Repurpose the pull utilities as their own navbar utilities to avoid specificity
+// issues with parents and chaining. Only do this when the navbar is uncollapsed
+// though so that navbar contents properly stack and align in mobile.
+
+@media (min-width: $grid-float-breakpoint) {
+  .navbar-left {
+    float: left !important;
+  }
+  .navbar-right {
+    float: right !important;
+  }
 }
 
 
+// Navbar form
+//
+// Extension of the `.form-inline` with some extra flavor for optimum display in
+// our navbars.
+
+.navbar-form {
+  margin-left: -$navbar-padding-horizontal;
+  margin-right: -$navbar-padding-horizontal;
+  padding: 10px $navbar-padding-horizontal;
+  border-top: 1px solid transparent;
+  border-bottom: 1px solid transparent;
+  $shadow: inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1);
+  @include box-shadow($shadow);
+
+  // Mixin behavior for optimum display
+  @extend .form-inline;
+
+  .form-group {
+    @media (max-width: $grid-float-breakpoint-max) {
+      margin-bottom: 5px;
+    }
+  }
+
+  // Vertically center in expanded, horizontal navbar
+  @include navbar-vertical-align($input-height-base);
+
+  // Undo 100% width for pull classes
+  @media (min-width: $grid-float-breakpoint) {
+    width: auto;
+    border: 0;
+    margin-left: 0;
+    margin-right: 0;
+    padding-top: 0;
+    padding-bottom: 0;
+    @include box-shadow(none);
+
+    // Outdent the form if last child to line up with content down the page
+    &.navbar-right:last-child {
+      margin-right: -$navbar-padding-horizontal;
+    }
+  }
+}
+
 
 // Dropdown menus
-// --------------
 
 // Menu position and menu carets
-.navbar .nav > li > .dropdown-menu {
-  &:before {
-    content: '';
-    display: inline-block;
-    border-left:   7px solid transparent;
-    border-right:  7px solid transparent;
-    border-bottom: 7px solid #ccc;
-    border-bottom-color: $dropdownBorder;
-    position: absolute;
-    top: -7px;
-    left: 9px;
-  }
-  &:after {
-    content: '';
-    display: inline-block;
-    border-left:   6px solid transparent;
-    border-right:  6px solid transparent;
-    border-bottom: 6px solid $dropdownBackground;
-    position: absolute;
-    top: -6px;
-    left: 10px;
-  }
+.navbar-nav > li > .dropdown-menu {
+  margin-top: 0;
+  @include border-top-radius(0);
 }
 // Menu position and menu caret support for dropups via extra dropup class
-.navbar-fixed-bottom .nav > li > .dropdown-menu {
-  &:before {
-    border-top: 7px solid #ccc;
-    border-top-color: $dropdownBorder;
-    border-bottom: 0;
-    bottom: -7px;
-    top: auto;
-  }
-  &:after {
-    border-top: 6px solid $dropdownBackground;
-    border-bottom: 0;
-    bottom: -6px;
-    top: auto;
-  }
+.navbar-fixed-bottom .navbar-nav > li > .dropdown-menu {
+  @include border-bottom-radius(0);
 }
 
-// Caret should match text color on hover/focus
-.navbar .nav li.dropdown > a:hover .caret,
-.navbar .nav li.dropdown > a:focus .caret {
-  border-top-color: $navbarLinkColorActive;
-  border-bottom-color: $navbarLinkColorActive;
-}
 
-// Remove background color from open dropdown
-.navbar .nav li.dropdown.open > .dropdown-toggle,
-.navbar .nav li.dropdown.active > .dropdown-toggle,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle {
-  background-color: $navbarLinkBackgroundActive;
-  color: $navbarLinkColorActive;
-}
-.navbar .nav li.dropdown > .dropdown-toggle .caret {
-  border-top-color: $navbarLinkColor;
-  border-bottom-color: $navbarLinkColor;
+// Buttons in navbars
+//
+// Vertically center a button within a navbar (when *not* in a form).
+
+.navbar-btn {
+  @include navbar-vertical-align($input-height-base);
+
+  &.btn-sm {
+    @include navbar-vertical-align($input-height-small);
+  }
+  &.btn-xs {
+    @include navbar-vertical-align(22);
+  }
 }
-.navbar .nav li.dropdown.open > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.active > .dropdown-toggle .caret,
-.navbar .nav li.dropdown.open.active > .dropdown-toggle .caret {
-  border-top-color: $navbarLinkColorActive;
-  border-bottom-color: $navbarLinkColorActive;
+
+
+// Text in navbars
+//
+// Add a class to make any element properly align itself vertically within the navbars.
+
+.navbar-text {
+  @include navbar-vertical-align($line-height-computed);
+
+  @media (min-width: $grid-float-breakpoint) {
+    float: left;
+    margin-left: $navbar-padding-horizontal;
+    margin-right: $navbar-padding-horizontal;
+
+    // Outdent the form if last child to line up with content down the page
+    &.navbar-right:last-child {
+      margin-right: 0;
+    }
+  }
 }
 
-// Right aligned menus need alt position
-.navbar .pull-right > li > .dropdown-menu,
-.navbar .nav > li > .dropdown-menu.pull-right {
-  left: auto;
-  right: 0;
-  &:before {
-    left: auto;
-    right: 12px;
+// Alternate navbars
+// --------------------------------------------------
+
+// Default navbar
+.navbar-default {
+  background-color: $navbar-default-bg;
+  border-color: $navbar-default-border;
+
+  .navbar-brand {
+    color: $navbar-default-brand-color;
+    &:hover,
+    &:focus {
+      color: $navbar-default-brand-hover-color;
+      background-color: $navbar-default-brand-hover-bg;
+    }
   }
-  &:after {
-    left: auto;
-    right: 13px;
+
+  .navbar-text {
+    color: $navbar-default-color;
   }
-  .dropdown-menu {
-    left: auto;
-    right: 100%;
-    margin-left: 0;
-    margin-right: -1px;
-    @include border-radius(6px 0 6px 6px);
+
+  .navbar-nav {
+    > li > a {
+      color: $navbar-default-link-color;
+
+      &:hover,
+      &:focus {
+        color: $navbar-default-link-hover-color;
+        background-color: $navbar-default-link-hover-bg;
+      }
+    }
+    > .active > a {
+      &,
+      &:hover,
+      &:focus {
+        color: $navbar-default-link-active-color;
+        background-color: $navbar-default-link-active-bg;
+      }
+    }
+    > .disabled > a {
+      &,
+      &:hover,
+      &:focus {
+        color: $navbar-default-link-disabled-color;
+        background-color: $navbar-default-link-disabled-bg;
+      }
+    }
   }
-}
 
+  .navbar-toggle {
+    border-color: $navbar-default-toggle-border-color;
+    &:hover,
+    &:focus {
+      background-color: $navbar-default-toggle-hover-bg;
+    }
+    .icon-bar {
+      background-color: $navbar-default-toggle-icon-bar-bg;
+    }
+  }
 
-// Inverted navbar
-// -------------------------
+  .navbar-collapse,
+  .navbar-form {
+    border-color: $navbar-default-border;
+  }
 
-.navbar-inverse {
+  // Dropdown menu items
+  .navbar-nav {
+    // Remove background color from open dropdown
+    > .open > a {
+      &,
+      &:hover,
+      &:focus {
+        background-color: $navbar-default-link-active-bg;
+        color: $navbar-default-link-active-color;
+      }
+    }
 
-  .navbar-inner {
-    @include gradient-vertical($navbarInverseBackgroundHighlight, $navbarInverseBackground);
-    border-color: $navbarInverseBorder;
+    @media (max-width: $grid-float-breakpoint-max) {
+      // Dropdowns get custom display when collapsed
+      .open .dropdown-menu {
+        > li > a {
+          color: $navbar-default-link-color;
+          &:hover,
+          &:focus {
+            color: $navbar-default-link-hover-color;
+            background-color: $navbar-default-link-hover-bg;
+          }
+        }
+        > .active > a {
+          &,
+          &:hover,
+          &:focus {
+            color: $navbar-default-link-active-color;
+            background-color: $navbar-default-link-active-bg;
+          }
+        }
+        > .disabled > a {
+          &,
+          &:hover,
+          &:focus {
+            color: $navbar-default-link-disabled-color;
+            background-color: $navbar-default-link-disabled-bg;
+          }
+        }
+      }
+    }
   }
 
-  .brand,
-  .nav > li > a {
-    color: $navbarInverseLinkColor;
-    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+
+  // Links in navbars
+  //
+  // Add a class to ensure links outside the navbar nav are colored correctly.
+
+  .navbar-link {
+    color: $navbar-default-link-color;
+    &:hover {
+      color: $navbar-default-link-hover-color;
+    }
+  }
+
+  .btn-link {
+    color: $navbar-default-link-color;
     &:hover,
     &:focus {
-      color: $navbarInverseLinkColorHover;
+      color: $navbar-default-link-hover-color;
+    }
+    &[disabled],
+    fieldset[disabled] & {
+      &:hover,
+      &:focus {
+        color: $navbar-default-link-disabled-color;
+      }
     }
   }
+}
 
-  .brand {
-    color: $navbarInverseBrandColor;
+// Inverse navbar
+
+.navbar-inverse {
+  background-color: $navbar-inverse-bg;
+  border-color: $navbar-inverse-border;
+
+  .navbar-brand {
+    color: $navbar-inverse-brand-color;
+    &:hover,
+    &:focus {
+      color: $navbar-inverse-brand-hover-color;
+      background-color: $navbar-inverse-brand-hover-bg;
+    }
   }
 
   .navbar-text {
-    color: $navbarInverseText;
+    color: $navbar-inverse-color;
   }
 
-  .nav > li > a:focus,
-  .nav > li > a:hover {
-    background-color: $navbarInverseLinkBackgroundHover;
-    color: $navbarInverseLinkColorHover;
-  }
+  .navbar-nav {
+    > li > a {
+      color: $navbar-inverse-link-color;
 
-  .nav .active > a,
-  .nav .active > a:hover,
-  .nav .active > a:focus {
-    color: $navbarInverseLinkColorActive;
-    background-color: $navbarInverseLinkBackgroundActive;
+      &:hover,
+      &:focus {
+        color: $navbar-inverse-link-hover-color;
+        background-color: $navbar-inverse-link-hover-bg;
+      }
+    }
+    > .active > a {
+      &,
+      &:hover,
+      &:focus {
+        color: $navbar-inverse-link-active-color;
+        background-color: $navbar-inverse-link-active-bg;
+      }
+    }
+    > .disabled > a {
+      &,
+      &:hover,
+      &:focus {
+        color: $navbar-inverse-link-disabled-color;
+        background-color: $navbar-inverse-link-disabled-bg;
+      }
+    }
   }
 
-  // Inline text links
-  .navbar-link {
-    color: $navbarInverseLinkColor;
+  // Darken the responsive nav toggle
+  .navbar-toggle {
+    border-color: $navbar-inverse-toggle-border-color;
     &:hover,
     &:focus {
-      color: $navbarInverseLinkColorHover;
+      background-color: $navbar-inverse-toggle-hover-bg;
+    }
+    .icon-bar {
+      background-color: $navbar-inverse-toggle-icon-bar-bg;
     }
   }
 
-  // Dividers in navbar
-  .divider-vertical {
-    border-left-color: $navbarInverseBackground;
-    border-right-color: $navbarInverseBackgroundHighlight;
+  .navbar-collapse,
+  .navbar-form {
+    border-color: darken($navbar-inverse-bg, 7%);
   }
 
   // Dropdowns
-  .nav li.dropdown.open > .dropdown-toggle,
-  .nav li.dropdown.active > .dropdown-toggle,
-  .nav li.dropdown.open.active > .dropdown-toggle {
-    background-color: $navbarInverseLinkBackgroundActive;
-    color: $navbarInverseLinkColorActive;
-  }
-  .nav li.dropdown > a:hover .caret,
-  .nav li.dropdown > a:focus .caret {
-    border-top-color: $navbarInverseLinkColorActive;
-    color: $navbarInverseLinkColorActive;
-  }
-  .nav li.dropdown > .dropdown-toggle .caret {
-    border-top-color: $navbarInverseLinkColor;
-    border-bottom-color: $navbarInverseLinkColor;
-  }
-  .nav li.dropdown.open > .dropdown-toggle .caret,
-  .nav li.dropdown.active > .dropdown-toggle .caret,
-  .nav li.dropdown.open.active > .dropdown-toggle .caret {
-    border-top-color: $navbarInverseLinkColorActive;
-    border-bottom-color: $navbarInverseLinkColorActive;
-  }
-
-  // Navbar search
-  .navbar-search {
-    .search-query {
-      color: $white;
-      background-color: $navbarInverseSearchBackground;
-      border-color: $navbarInverseSearchBorder;
-      @include box-shadow(inset 0 1px 2px rgba(0,0,0,.1), 0 1px 0 rgba(255,255,255,.15));
-      @include transition(none);
-      @include placeholder($navbarInverseSearchPlaceholderColor);
-
-      // Focus states (we use .focused since IE7-8 and down doesn't support :focus)
-      &:focus,
-      &.focused {
-        padding: 5px 15px;
-        color: $grayDark;
-        text-shadow: 0 1px 0 $white;
-        background-color: $navbarInverseSearchBackgroundFocus;
-        border: 0;
-        @include box-shadow(0 0 3px rgba(0,0,0,.15));
-        outline: 0;
+  .navbar-nav {
+    > .open > a {
+      &,
+      &:hover,
+      &:focus {
+        background-color: $navbar-inverse-link-active-bg;
+        color: $navbar-inverse-link-active-color;
+      }
+    }
+
+    @media (max-width: $grid-float-breakpoint-max) {
+      // Dropdowns get custom display
+      .open .dropdown-menu {
+        > .dropdown-header {
+          border-color: $navbar-inverse-border;
+        }
+        .divider {
+          background-color: $navbar-inverse-border;
+        }
+        > li > a {
+          color: $navbar-inverse-link-color;
+          &:hover,
+          &:focus {
+            color: $navbar-inverse-link-hover-color;
+            background-color: $navbar-inverse-link-hover-bg;
+          }
+        }
+        > .active > a {
+          &,
+          &:hover,
+          &:focus {
+            color: $navbar-inverse-link-active-color;
+            background-color: $navbar-inverse-link-active-bg;
+          }
+        }
+        > .disabled > a {
+          &,
+          &:hover,
+          &:focus {
+            color: $navbar-inverse-link-disabled-color;
+            background-color: $navbar-inverse-link-disabled-bg;
+          }
+        }
       }
     }
   }
 
-  // Navbar collapse button
-  .btn-navbar {
-    @include buttonBackground(darken($navbarInverseBackgroundHighlight, 5%), darken($navbarInverseBackground, 5%));
+  .navbar-link {
+    color: $navbar-inverse-link-color;
+    &:hover {
+      color: $navbar-inverse-link-hover-color;
+    }
   }
 
+  .btn-link {
+    color: $navbar-inverse-link-color;
+    &:hover,
+    &:focus {
+      color: $navbar-inverse-link-hover-color;
+    }
+    &[disabled],
+    fieldset[disabled] & {
+      &:hover,
+      &:focus {
+        color: $navbar-inverse-link-disabled-color;
+      }
+    }
+  }
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_navs.scss b/app/assets/stylesheets/rails_admin/bootstrap/_navs.scss
old mode 100755
new mode 100644
index 31c4451d12..90168734b7
--- a/app/assets/stylesheets/rails_admin/bootstrap/_navs.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_navs.scss
@@ -3,407 +3,240 @@
 // --------------------------------------------------
 
 
-// BASE CLASS
-// ----------
+// Base class
+// --------------------------------------------------
 
 .nav {
-  margin-left: 0;
-  margin-bottom: $baseLineHeight;
+  margin-bottom: 0;
+  padding-left: 0; // Override default ul/ol
   list-style: none;
-}
-
-// Make links block level
-.nav > li > a {
-  display: block;
-}
-.nav > li > a:hover,
-.nav > li > a:focus {
-  text-decoration: none;
-  background-color: $grayLighter;
-}
-
-// Prevent IE8 from misplacing imgs
-// See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
-.nav > li > a > img {
-  max-width: none;
-}
-
-// Redeclare pull classes because of specifity
-.nav > .pull-right {
-  float: right;
-}
-
-// Nav headers (for dropdowns and lists)
-.nav-header {
-  display: block;
-  padding: 3px 15px;
-  font-size: 11px;
-  font-weight: bold;
-  line-height: $baseLineHeight;
-  color: $grayLight;
-  text-shadow: 0 1px 0 rgba(255,255,255,.5);
-  text-transform: uppercase;
-}
-// Space them out when they follow another list item (link)
-.nav li + .nav-header {
-  margin-top: 9px;
-}
+  @include clearfix();
 
+  > li {
+    position: relative;
+    display: block;
+
+    > a {
+      position: relative;
+      display: block;
+      padding: $nav-link-padding;
+      &:hover,
+      &:focus {
+        text-decoration: none;
+        background-color: $nav-link-hover-bg;
+      }
+    }
+
+    // Disabled state sets text to gray and nukes hover/tab effects
+    &.disabled > a {
+      color: $nav-disabled-link-color;
+
+      &:hover,
+      &:focus {
+        color: $nav-disabled-link-hover-color;
+        text-decoration: none;
+        background-color: transparent;
+        cursor: not-allowed;
+      }
+    }
+  }
 
+  // Open dropdowns
+  .open > a {
+    &,
+    &:hover,
+    &:focus {
+      background-color: $nav-link-hover-bg;
+      border-color: $link-color;
+    }
+  }
 
-// NAV LIST
-// --------
+  // Nav dividers (deprecated with v3.0.1)
+  //
+  // This should have been removed in v3 with the dropping of `.nav-list`, but
+  // we missed it. We don't currently support this anywhere, but in the interest
+  // of maintaining backward compatibility in case you use it, it's deprecated.
+  .nav-divider {
+    @include nav-divider();
+  }
 
-.nav-list {
-  padding-left: 15px;
-  padding-right: 15px;
-  margin-bottom: 0;
-}
-.nav-list > li > a,
-.nav-list .nav-header {
-  margin-left:  -15px;
-  margin-right: -15px;
-  text-shadow: 0 1px 0 rgba(255,255,255,.5);
-}
-.nav-list > li > a {
-  padding: 3px 15px;
-}
-.nav-list > .active > a,
-.nav-list > .active > a:hover,
-.nav-list > .active > a:focus {
-  color: $white;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.2);
-  background-color: $linkColor;
-}
-.nav-list [class^="icon-"],
-.nav-list [class*=" icon-"] {
-  margin-right: 2px;
-}
-// Dividers (basically an hr) within the dropdown
-.nav-list .divider {
-  @include nav-divider();
+  // Prevent IE8 from misplacing imgs
+  //
+  // See https://github.com/h5bp/html5-boilerplate/issues/984#issuecomment-3985989
+  > li > a > img {
+    max-width: none;
+  }
 }
 
 
-
-// TABS AND PILLS
-// -------------
-
-// Common styles
-.nav-tabs,
-.nav-pills {
-  @include clearfix();
-}
-.nav-tabs > li,
-.nav-pills > li {
-  float: left;
-}
-.nav-tabs > li > a,
-.nav-pills > li > a {
-  padding-right: 12px;
-  padding-left: 12px;
-  margin-right: 2px;
-  line-height: 14px; // keeps the overall height an even number
-}
-
-// TABS
-// ----
+// Tabs
+// -------------------------
 
 // Give the tabs something to sit on
 .nav-tabs {
-  border-bottom: 1px solid #ddd;
-}
-// Make the list-items overlay the bottom border
-.nav-tabs > li {
-  margin-bottom: -1px;
-}
-// Actual tabs (as links)
-.nav-tabs > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  line-height: $baseLineHeight;
-  border: 1px solid transparent;
-  @include border-radius(4px 4px 0 0);
-  &:hover,
-  &:focus {
-    border-color: $grayLighter $grayLighter #ddd;
+  border-bottom: 1px solid $nav-tabs-border-color;
+  > li {
+    float: left;
+    // Make the list-items overlay the bottom border
+    margin-bottom: -1px;
+
+    // Actual tabs (as links)
+    > a {
+      margin-right: 2px;
+      line-height: $line-height-base;
+      border: 1px solid transparent;
+      border-radius: $border-radius-base $border-radius-base 0 0;
+      &:hover {
+        border-color: $nav-tabs-link-hover-border-color $nav-tabs-link-hover-border-color $nav-tabs-border-color;
+      }
+    }
+
+    // Active state, and its :hover to override normal :hover
+    &.active > a {
+      &,
+      &:hover,
+      &:focus {
+        color: $nav-tabs-active-link-hover-color;
+        background-color: $nav-tabs-active-link-hover-bg;
+        border: 1px solid $nav-tabs-active-link-hover-border-color;
+        border-bottom-color: transparent;
+        cursor: default;
+      }
+    }
+  }
+  // pulling this in mainly for less shorthand
+  &.nav-justified {
+    @extend .nav-justified;
+    @extend .nav-tabs-justified;
   }
-}
-// Active state, and it's :hover/:focus to override normal :hover/:focus
-.nav-tabs > .active > a,
-.nav-tabs > .active > a:hover,
-.nav-tabs > .active > a:focus {
-  color: $gray;
-  background-color: $bodyBackground;
-  border: 1px solid #ddd;
-  border-bottom-color: transparent;
-  cursor: default;
-}
-
-
-// PILLS
-// -----
-
-// Links rendered as pills
-.nav-pills > li > a {
-  padding-top: 8px;
-  padding-bottom: 8px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  @include border-radius(5px);
-}
-
-// Active state
-.nav-pills > .active > a,
-.nav-pills > .active > a:hover,
-.nav-pills > .active > a:focus {
-  color: $white;
-  background-color: $linkColor;
-}
-
-
-
-// STACKED NAV
-// -----------
-
-// Stacked tabs and pills
-.nav-stacked > li {
-  float: none;
-}
-.nav-stacked > li > a {
-  margin-right: 0; // no need for the gap between nav items
 }
 
-// Tabs
-.nav-tabs.nav-stacked {
-  border-bottom: 0;
-}
-.nav-tabs.nav-stacked > li > a {
-  border: 1px solid #ddd;
-  @include border-radius(0);
-}
-.nav-tabs.nav-stacked > li:first-child > a {
-  @include border-top-radius(4px);
-}
-.nav-tabs.nav-stacked > li:last-child > a {
-  @include border-bottom-radius(4px);
-}
-.nav-tabs.nav-stacked > li > a:hover,
-.nav-tabs.nav-stacked > li > a:focus {
-  border-color: #ddd;
-  z-index: 2;
-}
 
 // Pills
-.nav-pills.nav-stacked > li > a {
-  margin-bottom: 3px;
-}
-.nav-pills.nav-stacked > li:last-child > a {
-  margin-bottom: 1px; // decrease margin to match sizing of stacked tabs
-}
-
-
-
-// DROPDOWNS
-// ---------
-
-.nav-tabs .dropdown-menu {
-  @include border-radius(0 0 6px 6px); // remove the top rounded corners here since there is a hard edge above the menu
-}
-.nav-pills .dropdown-menu {
-  @include border-radius(6px); // make rounded corners match the pills
-}
-
-// Default dropdown links
 // -------------------------
-// Make carets use linkColor to start
-.nav .dropdown-toggle .caret {
-  border-top-color: $linkColor;
-  border-bottom-color: $linkColor;
-  margin-top: 6px;
-}
-.nav .dropdown-toggle:hover .caret,
-.nav .dropdown-toggle:focus .caret {
-  border-top-color: $linkColorHover;
-  border-bottom-color: $linkColorHover;
-}
-/* move down carets for tabs */
-.nav-tabs .dropdown-toggle .caret {
-  margin-top: 8px;
-}
-
-// Active dropdown links
-// -------------------------
-.nav .active .dropdown-toggle .caret {
-  border-top-color: #fff;
-  border-bottom-color: #fff;
-}
-.nav-tabs .active .dropdown-toggle .caret {
-  border-top-color: $gray;
-  border-bottom-color: $gray;
+.nav-pills {
+  > li {
+    float: left;
+
+    // Links rendered as pills
+    > a {
+      border-radius: $nav-pills-border-radius;
+    }
+    + li {
+      margin-left: 2px;
+    }
+
+    // Active state
+    &.active > a {
+      &,
+      &:hover,
+      &:focus {
+        color: $nav-pills-active-link-hover-color;
+        background-color: $nav-pills-active-link-hover-bg;
+      }
+    }
+  }
 }
 
-// Active:hover/:focus dropdown links
-// -------------------------
-.nav > .dropdown.active > a:hover,
-.nav > .dropdown.active > a:focus {
-  cursor: pointer;
-}
 
-// Open dropdowns
-// -------------------------
-.nav-tabs .open .dropdown-toggle,
-.nav-pills .open .dropdown-toggle,
-.nav > li.dropdown.open.active > a:hover,
-.nav > li.dropdown.open.active > a:focus {
-  color: $white;
-  background-color: $grayLight;
-  border-color: $grayLight;
-}
-.nav li.dropdown.open .caret,
-.nav li.dropdown.open.active .caret,
-.nav li.dropdown.open a:hover .caret,
-.nav li.dropdown.open a:focus .caret {
-  border-top-color: $white;
-  border-bottom-color: $white;
-  @include opacity(100);
+// Stacked pills
+.nav-stacked {
+  > li {
+    float: none;
+    + li {
+      margin-top: 2px;
+      margin-left: 0; // no need for this gap between nav items
+    }
+  }
 }
 
-// Dropdowns in stacked tabs
-.tabs-stacked .open > a:hover,
-.tabs-stacked .open > a:focus {
-  border-color: $grayLight;
-}
 
+// Nav variations
+// --------------------------------------------------
 
+// Justified nav links
+// -------------------------
 
-// TABBABLE
-// --------
+.nav-justified {
+  width: 100%;
 
+  > li {
+    float: none;
+    > a {
+      text-align: center;
+      margin-bottom: 5px;
+    }
+  }
 
-// COMMON STYLES
-// -------------
+  > .dropdown .dropdown-menu {
+    top: auto;
+    left: auto;
+  }
 
-// Clear any floats
-.tabbable {
-  @include clearfix();
-}
-.tab-content {
-  overflow: auto; // prevent content from running below tabs
+  @media (min-width: $screen-sm-min) {
+    > li {
+      display: table-cell;
+      width: 1%;
+      > a {
+        margin-bottom: 0;
+      }
+    }
+  }
 }
 
-// Remove border on bottom, left, right
-.tabs-below > .nav-tabs,
-.tabs-right > .nav-tabs,
-.tabs-left > .nav-tabs {
+// Move borders to anchors instead of bottom of list
+//
+// Mixin for adding on top the shared `.nav-justified` styles for our tabs
+.nav-tabs-justified {
   border-bottom: 0;
-}
-
-// Show/hide tabbable areas
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
-  display: none;
-}
-.tab-content > .active,
-.pill-content > .active {
-  display: block;
-}
 
+  > li > a {
+    // Override margin from .nav-tabs
+    margin-right: 0;
+    border-radius: $border-radius-base;
+  }
 
-// BOTTOM
-// ------
+  > .active > a,
+  > .active > a:hover,
+  > .active > a:focus {
+    border: 1px solid $nav-tabs-justified-link-border-color;
+  }
 
-.tabs-below > .nav-tabs {
-  border-top: 1px solid #ddd;
-}
-.tabs-below > .nav-tabs > li {
-  margin-top: -1px;
-  margin-bottom: 0;
-}
-.tabs-below > .nav-tabs > li > a {
-  @include border-radius(0 0 4px 4px);
-  &:hover,
-  &:focus {
-    border-bottom-color: transparent;
-    border-top-color: #ddd;
+  @media (min-width: $screen-sm-min) {
+    > li > a {
+      border-bottom: 1px solid $nav-tabs-justified-link-border-color;
+      border-radius: $border-radius-base $border-radius-base 0 0;
+    }
+    > .active > a,
+    > .active > a:hover,
+    > .active > a:focus {
+      border-bottom-color: $nav-tabs-justified-active-link-border-color;
+    }
   }
 }
-.tabs-below > .nav-tabs > .active > a,
-.tabs-below > .nav-tabs > .active > a:hover,
-.tabs-below > .nav-tabs > .active > a:focus {
-  border-color: transparent #ddd #ddd #ddd;
-}
 
-// LEFT & RIGHT
-// ------------
 
-// Common styles
-.tabs-left > .nav-tabs > li,
-.tabs-right > .nav-tabs > li {
-  float: none;
-}
-.tabs-left > .nav-tabs > li > a,
-.tabs-right > .nav-tabs > li > a {
-  min-width: 74px;
-  margin-right: 0;
-  margin-bottom: 3px;
-}
-
-// Tabs on the left
-.tabs-left > .nav-tabs {
-  float: left;
-  margin-right: 19px;
-  border-right: 1px solid #ddd;
-}
-.tabs-left > .nav-tabs > li > a {
-  margin-right: -1px;
-  @include border-radius(4px 0 0 4px);
-}
-.tabs-left > .nav-tabs > li > a:hover,
-.tabs-left > .nav-tabs > li > a:focus {
-  border-color: $grayLighter #ddd $grayLighter $grayLighter;
-}
-.tabs-left > .nav-tabs .active > a,
-.tabs-left > .nav-tabs .active > a:hover,
-.tabs-left > .nav-tabs .active > a:focus {
-  border-color: #ddd transparent #ddd #ddd;
-  *border-right-color: $white;
-}
+// Tabbable tabs
+// -------------------------
 
-// Tabs on the right
-.tabs-right > .nav-tabs {
-  float: right;
-  margin-left: 19px;
-  border-left: 1px solid #ddd;
-}
-.tabs-right > .nav-tabs > li > a {
-  margin-left: -1px;
-  @include border-radius(0 4px 4px 0);
-}
-.tabs-right > .nav-tabs > li > a:hover,
-.tabs-right > .nav-tabs > li > a:focus {
-  border-color: $grayLighter $grayLighter $grayLighter #ddd;
-}
-.tabs-right > .nav-tabs .active > a,
-.tabs-right > .nav-tabs .active > a:hover,
-.tabs-right > .nav-tabs .active > a:focus {
-  border-color: #ddd #ddd #ddd transparent;
-  *border-left-color: $white;
+// Hide tabbable panes to start, show them when `.active`
+.tab-content {
+  > .tab-pane {
+    display: none;
+  }
+  > .active {
+    display: block;
+  }
 }
 
 
+// Dropdowns
+// -------------------------
 
-// DISABLED STATES
-// ---------------
-
-// Gray out text
-.nav > .disabled > a {
-  color: $grayLight;
-}
-// Nuke hover/focus effects
-.nav > .disabled > a:hover,
-.nav > .disabled > a:focus {
-  text-decoration: none;
-  background-color: transparent;
-  cursor: default;
+// Specific dropdowns
+.nav-tabs .dropdown-menu {
+  // make dropdown border overlap tab border
+  margin-top: -1px;
+  // Remove the top rounded corners here since there is a hard edge above the menu
+  @include border-top-radius(0);
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_normalize.scss b/app/assets/stylesheets/rails_admin/bootstrap/_normalize.scss
new file mode 100644
index 0000000000..ce04b6a2f9
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_normalize.scss
@@ -0,0 +1,425 @@
+/*! normalize.css v3.0.1 | MIT License | git.io/normalize */
+
+//
+// 1. Set default font family to sans-serif.
+// 2. Prevent iOS text size adjust after orientation change, without disabling
+//    user zoom.
+//
+
+html {
+  font-family: sans-serif; // 1
+  -ms-text-size-adjust: 100%; // 2
+  -webkit-text-size-adjust: 100%; // 2
+}
+
+//
+// Remove default margin.
+//
+
+body {
+  margin: 0;
+}
+
+// HTML5 display definitions
+// ==========================================================================
+
+//
+// Correct `block` display not defined for any HTML5 element in IE 8/9.
+// Correct `block` display not defined for `details` or `summary` in IE 10/11 and Firefox.
+// Correct `block` display not defined for `main` in IE 11.
+//
+
+article,
+aside,
+details,
+figcaption,
+figure,
+footer,
+header,
+hgroup,
+main,
+nav,
+section,
+summary {
+  display: block;
+}
+
+//
+// 1. Correct `inline-block` display not defined in IE 8/9.
+// 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
+//
+
+audio,
+canvas,
+progress,
+video {
+  display: inline-block; // 1
+  vertical-align: baseline; // 2
+}
+
+//
+// Prevent modern browsers from displaying `audio` without controls.
+// Remove excess height in iOS 5 devices.
+//
+
+audio:not([controls]) {
+  display: none;
+  height: 0;
+}
+
+//
+// Address `[hidden]` styling not present in IE 8/9/10.
+// Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
+//
+
+[hidden],
+template {
+  display: none;
+}
+
+// Links
+// ==========================================================================
+
+//
+// Remove the gray background color from active links in IE 10.
+//
+
+a {
+  background: transparent;
+}
+
+//
+// Improve readability when focused and also mouse hovered in all browsers.
+//
+
+a:active,
+a:hover {
+  outline: 0;
+}
+
+// Text-level semantics
+// ==========================================================================
+
+//
+// Address styling not present in IE 8/9/10/11, Safari, and Chrome.
+//
+
+abbr[title] {
+  border-bottom: 1px dotted;
+}
+
+//
+// Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
+//
+
+b,
+strong {
+  font-weight: bold;
+}
+
+//
+// Address styling not present in Safari and Chrome.
+//
+
+dfn {
+  font-style: italic;
+}
+
+//
+// Address variable `h1` font-size and margin within `section` and `article`
+// contexts in Firefox 4+, Safari, and Chrome.
+//
+
+h1 {
+  font-size: 2em;
+  margin: 0.67em 0;
+}
+
+//
+// Address styling not present in IE 8/9.
+//
+
+mark {
+  background: #ff0;
+  color: #000;
+}
+
+//
+// Address inconsistent and variable font size in all browsers.
+//
+
+small {
+  font-size: 80%;
+}
+
+//
+// Prevent `sub` and `sup` affecting `line-height` in all browsers.
+//
+
+sub,
+sup {
+  font-size: 75%;
+  line-height: 0;
+  position: relative;
+  vertical-align: baseline;
+}
+
+sup {
+  top: -0.5em;
+}
+
+sub {
+  bottom: -0.25em;
+}
+
+// Embedded content
+// ==========================================================================
+
+//
+// Remove border when inside `a` element in IE 8/9/10.
+//
+
+img {
+  border: 0;
+}
+
+//
+// Correct overflow not hidden in IE 9/10/11.
+//
+
+svg:not(:root) {
+  overflow: hidden;
+}
+
+// Grouping content
+// ==========================================================================
+
+//
+// Address margin not present in IE 8/9 and Safari.
+//
+
+figure {
+  margin: 1em 40px;
+}
+
+//
+// Address differences between Firefox and other browsers.
+//
+
+hr {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
+  height: 0;
+}
+
+//
+// Contain overflow in all browsers.
+//
+
+pre {
+  overflow: auto;
+}
+
+//
+// Address odd `em`-unit font size rendering in all browsers.
+//
+
+code,
+kbd,
+pre,
+samp {
+  font-family: monospace, monospace;
+  font-size: 1em;
+}
+
+// Forms
+// ==========================================================================
+
+//
+// Known limitation: by default, Chrome and Safari on OS X allow very limited
+// styling of `select`, unless a `border` property is set.
+//
+
+//
+// 1. Correct color not being inherited.
+//    Known issue: affects color of disabled elements.
+// 2. Correct font properties not being inherited.
+// 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
+//
+
+button,
+input,
+optgroup,
+select,
+textarea {
+  color: inherit; // 1
+  font: inherit; // 2
+  margin: 0; // 3
+}
+
+//
+// Address `overflow` set to `hidden` in IE 8/9/10/11.
+//
+
+button {
+  overflow: visible;
+}
+
+//
+// Address inconsistent `text-transform` inheritance for `button` and `select`.
+// All other form control elements do not inherit `text-transform` values.
+// Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
+// Correct `select` style inheritance in Firefox.
+//
+
+button,
+select {
+  text-transform: none;
+}
+
+//
+// 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
+//    and `video` controls.
+// 2. Correct inability to style clickable `input` types in iOS.
+// 3. Improve usability and consistency of cursor style between image-type
+//    `input` and others.
+//
+
+button,
+html input[type="button"], // 1
+input[type="reset"],
+input[type="submit"] {
+  -webkit-appearance: button; // 2
+  cursor: pointer; // 3
+}
+
+//
+// Re-set default cursor for disabled elements.
+//
+
+button[disabled],
+html input[disabled] {
+  cursor: default;
+}
+
+//
+// Remove inner padding and border in Firefox 4+.
+//
+
+button::-moz-focus-inner,
+input::-moz-focus-inner {
+  border: 0;
+  padding: 0;
+}
+
+//
+// Address Firefox 4+ setting `line-height` on `input` using `!important` in
+// the UA stylesheet.
+//
+
+input {
+  line-height: normal;
+}
+
+//
+// It's recommended that you don't attempt to style these elements.
+// Firefox's implementation doesn't respect box-sizing, padding, or width.
+//
+// 1. Address box sizing set to `content-box` in IE 8/9/10.
+// 2. Remove excess padding in IE 8/9/10.
+//
+
+input[type="checkbox"],
+input[type="radio"] {
+  box-sizing: border-box; // 1
+  padding: 0; // 2
+}
+
+//
+// Fix the cursor style for Chrome's increment/decrement buttons. For certain
+// `font-size` values of the `input`, it causes the cursor style of the
+// decrement button to change from `default` to `text`.
+//
+
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  height: auto;
+}
+
+//
+// 1. Address `appearance` set to `searchfield` in Safari and Chrome.
+// 2. Address `box-sizing` set to `border-box` in Safari and Chrome
+//    (include `-moz` to future-proof).
+//
+
+input[type="search"] {
+  -webkit-appearance: textfield; // 1
+  -moz-box-sizing: content-box;
+  -webkit-box-sizing: content-box; // 2
+  box-sizing: content-box;
+}
+
+//
+// Remove inner padding and search cancel button in Safari and Chrome on OS X.
+// Safari (but not Chrome) clips the cancel button when the search input has
+// padding (and `textfield` appearance).
+//
+
+input[type="search"]::-webkit-search-cancel-button,
+input[type="search"]::-webkit-search-decoration {
+  -webkit-appearance: none;
+}
+
+//
+// Define consistent border, margin, and padding.
+//
+
+fieldset {
+  border: 1px solid #c0c0c0;
+  margin: 0 2px;
+  padding: 0.35em 0.625em 0.75em;
+}
+
+//
+// 1. Correct `color` not being inherited in IE 8/9/10/11.
+// 2. Remove padding so people aren't caught out if they zero out fieldsets.
+//
+
+legend {
+  border: 0; // 1
+  padding: 0; // 2
+}
+
+//
+// Remove default vertical scrollbar in IE 8/9/10/11.
+//
+
+textarea {
+  overflow: auto;
+}
+
+//
+// Don't inherit the `font-weight` (applied by a rule above).
+// NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
+//
+
+optgroup {
+  font-weight: bold;
+}
+
+// Tables
+// ==========================================================================
+
+//
+// Remove most spacing between table cells.
+//
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
+td,
+th {
+  padding: 0;
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_pager.scss b/app/assets/stylesheets/rails_admin/bootstrap/_pager.scss
old mode 100755
new mode 100644
index 46df08f793..6531fe6f89
--- a/app/assets/stylesheets/rails_admin/bootstrap/_pager.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_pager.scss
@@ -4,40 +4,52 @@
 
 
 .pager {
-  margin: $baseLineHeight 0;
+  padding-left: 0;
+  margin: $line-height-computed 0;
   list-style: none;
   text-align: center;
   @include clearfix();
-}
-.pager li {
-  display: inline;
-}
-.pager li > a,
-.pager li > span {
-  display: inline-block;
-  padding: 5px 14px;
-  background-color: #fff;
-  border: 1px solid #ddd;
-  @include border-radius(15px);
-}
-.pager li > a:hover,
-.pager li > a:focus {
-  text-decoration: none;
-  background-color: #f5f5f5;
-}
-.pager .next > a,
-.pager .next > span {
-  float: right;
-}
-.pager .previous > a,
-.pager .previous > span {
-  float: left;
-}
-.pager .disabled > a,
-.pager .disabled > a:hover,
-.pager .disabled > a:focus,
-.pager .disabled > span {
-  color: $grayLight;
-  background-color: #fff;
-  cursor: default;
+  li {
+    display: inline;
+    > a,
+    > span {
+      display: inline-block;
+      padding: 5px 14px;
+      background-color: $pager-bg;
+      border: 1px solid $pager-border;
+      border-radius: $pager-border-radius;
+    }
+
+    > a:hover,
+    > a:focus {
+      text-decoration: none;
+      background-color: $pager-hover-bg;
+    }
+  }
+
+  .next {
+    > a,
+    > span {
+      float: right;
+    }
+  }
+
+  .previous {
+    > a,
+    > span {
+      float: left;
+    }
+  }
+
+  .disabled {
+    > a,
+    > a:hover,
+    > a:focus,
+    > span {
+      color: $pager-disabled-color;
+      background-color: $pager-bg;
+      cursor: not-allowed;
+    }
+  }
+
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_pagination.scss b/app/assets/stylesheets/rails_admin/bootstrap/_pagination.scss
old mode 100755
new mode 100644
index 8ab33baffd..44c12226b0
--- a/app/assets/stylesheets/rails_admin/bootstrap/_pagination.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_pagination.scss
@@ -1,123 +1,88 @@
 //
 // Pagination (multiple pages)
 // --------------------------------------------------
-
-// Space out pagination from surrounding content
 .pagination {
-  margin: $baseLineHeight 0;
-}
-
-.pagination ul {
-  // Allow for text-based alignment
   display: inline-block;
-  @include ie7-inline-block();
-  // Reset default ul styles
-  margin-left: 0;
-  margin-bottom: 0;
-  // Visuals
-  @include border-radius($baseBorderRadius);
-  @include box-shadow(0 1px 2px rgba(0,0,0,.05));
-}
-.pagination ul > li {
-  display: inline; // Remove list-style and block-level defaults
-}
-.pagination ul > li > a,
-.pagination ul > li > span {
-  float: left; // Collapse white-space
-  padding: 4px 12px;
-  line-height: $baseLineHeight;
-  text-decoration: none;
-  background-color: $paginationBackground;
-  border: 1px solid $paginationBorder;
-  border-left-width: 0;
-}
-.pagination ul > li > a:hover,
-.pagination ul > li > a:focus,
-.pagination ul > .active > a,
-.pagination ul > .active > span {
-  background-color: $paginationActiveBackground;
-}
-.pagination ul > .active > a,
-.pagination ul > .active > span {
-  color: $grayLight;
-  cursor: default;
-}
-.pagination ul > .disabled > span,
-.pagination ul > .disabled > a,
-.pagination ul > .disabled > a:hover,
-.pagination ul > .disabled > a:focus {
-  color: $grayLight;
-  background-color: transparent;
-  cursor: default;
-}
-.pagination ul > li:first-child > a,
-.pagination ul > li:first-child > span {
-  border-left-width: 1px;
-  @include border-left-radius($baseBorderRadius);
-}
-.pagination ul > li:last-child > a,
-.pagination ul > li:last-child > span {
-  @include border-right-radius($baseBorderRadius);
-}
+  padding-left: 0;
+  margin: $line-height-computed 0;
+  border-radius: $border-radius-base;
 
+  > li {
+    display: inline; // Remove list-style and block-level defaults
+    > a,
+    > span {
+      position: relative;
+      float: left; // Collapse white-space
+      padding: $padding-base-vertical $padding-base-horizontal;
+      line-height: $line-height-base;
+      text-decoration: none;
+      color: $pagination-color;
+      background-color: $pagination-bg;
+      border: 1px solid $pagination-border;
+      margin-left: -1px;
+    }
+    &:first-child {
+      > a,
+      > span {
+        margin-left: 0;
+        @include border-left-radius($border-radius-base);
+      }
+    }
+    &:last-child {
+      > a,
+      > span {
+        @include border-right-radius($border-radius-base);
+      }
+    }
+  }
 
-// Alignment
-// --------------------------------------------------
+  > li > a,
+  > li > span {
+    &:hover,
+    &:focus {
+      color: $pagination-hover-color;
+      background-color: $pagination-hover-bg;
+      border-color: $pagination-hover-border;
+    }
+  }
 
-.pagination-centered {
-  text-align: center;
-}
-.pagination-right {
-  text-align: right;
-}
+  > .active > a,
+  > .active > span {
+    &,
+    &:hover,
+    &:focus {
+      z-index: 2;
+      color: $pagination-active-color;
+      background-color: $pagination-active-bg;
+      border-color: $pagination-active-border;
+      cursor: default;
+    }
+  }
 
+  > .disabled {
+    > span,
+    > span:hover,
+    > span:focus,
+    > a,
+    > a:hover,
+    > a:focus {
+      color: $pagination-disabled-color;
+      background-color: $pagination-disabled-bg;
+      border-color: $pagination-disabled-border;
+      cursor: not-allowed;
+    }
+  }
+}
 
 // Sizing
 // --------------------------------------------------
 
 // Large
-.pagination-large {
-  ul > li > a,
-  ul > li > span {
-    padding: $paddingLarge;
-    font-size: $fontSizeLarge;
-  }
-  ul > li:first-child > a,
-  ul > li:first-child > span {
-    @include border-left-radius($borderRadiusLarge);
-  }
-  ul > li:last-child > a,
-  ul > li:last-child > span {
-    @include border-right-radius($borderRadiusLarge);
-  }
-}
-
-// Small and mini
-.pagination-mini,
-.pagination-small {
-  ul > li:first-child > a,
-  ul > li:first-child > span {
-    @include border-left-radius($borderRadiusSmall);
-  }
-  ul > li:last-child > a,
-  ul > li:last-child > span {
-    @include border-right-radius($borderRadiusSmall);
-  }
+.pagination-lg {
+  @include pagination-size($padding-large-vertical, $padding-large-horizontal, $font-size-large, $border-radius-large);
 }
 
 // Small
-.pagination-small {
-  ul > li > a,
-  ul > li > span {
-    padding: $paddingSmall;
-    font-size: $fontSizeSmall;
-  }
-}
-// Mini
-.pagination-mini {
-  ul > li > a,
-  ul > li > span {
-    padding: $paddingMini;
-    font-size: $fontSizeMini;
-  }
+.pagination-sm {
+  @include pagination-size($padding-small-vertical, $padding-small-horizontal, $font-size-small, $border-radius-small);
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_panels.scss b/app/assets/stylesheets/rails_admin/bootstrap/_panels.scss
new file mode 100644
index 0000000000..57cdcbc1f1
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_panels.scss
@@ -0,0 +1,243 @@
+//
+// Panels
+// --------------------------------------------------
+
+
+// Base class
+.panel {
+  margin-bottom: $line-height-computed;
+  background-color: $panel-bg;
+  border: 1px solid transparent;
+  border-radius: $panel-border-radius;
+  @include box-shadow(0 1px 1px rgba(0,0,0,.05));
+}
+
+// Panel contents
+.panel-body {
+  padding: $panel-body-padding;
+  @include clearfix();
+}
+
+// Optional heading
+.panel-heading {
+  padding: $panel-heading-padding;
+  border-bottom: 1px solid transparent;
+  @include border-top-radius(($panel-border-radius - 1));
+
+  > .dropdown .dropdown-toggle {
+    color: inherit;
+  }
+}
+
+// Within heading, strip any `h*` tag of its default margins for spacing.
+.panel-title {
+  margin-top: 0;
+  margin-bottom: 0;
+  font-size: ceil(($font-size-base * 1.125));
+  color: inherit;
+
+  > a {
+    color: inherit;
+  }
+}
+
+// Optional footer (stays gray in every modifier class)
+.panel-footer {
+  padding: $panel-footer-padding;
+  background-color: $panel-footer-bg;
+  border-top: 1px solid $panel-inner-border;
+  @include border-bottom-radius(($panel-border-radius - 1));
+}
+
+
+// List groups in panels
+//
+// By default, space out list group content from panel headings to account for
+// any kind of custom content between the two.
+
+.panel {
+  > .list-group {
+    margin-bottom: 0;
+
+    .list-group-item {
+      border-width: 1px 0;
+      border-radius: 0;
+    }
+
+    // Add border top radius for first one
+    &:first-child {
+      .list-group-item:first-child {
+        border-top: 0;
+        @include border-top-radius(($panel-border-radius - 1));
+      }
+    }
+    // Add border bottom radius for last one
+    &:last-child {
+      .list-group-item:last-child {
+        border-bottom: 0;
+        @include border-bottom-radius(($panel-border-radius - 1));
+      }
+    }
+  }
+}
+// Collapse space between when there's no additional content.
+.panel-heading + .list-group {
+  .list-group-item:first-child {
+    border-top-width: 0;
+  }
+}
+.list-group + .panel-footer {
+  border-top-width: 0;
+}
+
+// Tables in panels
+//
+// Place a non-bordered `.table` within a panel (not within a `.panel-body`) and
+// watch it go full width.
+
+.panel {
+  > .table,
+  > .table-responsive > .table,
+  > .panel-collapse > .table {
+    margin-bottom: 0;
+  }
+  // Add border top radius for first one
+  > .table:first-child,
+  > .table-responsive:first-child > .table:first-child {
+    @include border-top-radius(($panel-border-radius - 1));
+
+    > thead:first-child,
+    > tbody:first-child {
+      > tr:first-child {
+        td:first-child,
+        th:first-child {
+          border-top-left-radius: ($panel-border-radius - 1);
+        }
+        td:last-child,
+        th:last-child {
+          border-top-right-radius: ($panel-border-radius - 1);
+        }
+      }
+    }
+  }
+  // Add border bottom radius for last one
+  > .table:last-child,
+  > .table-responsive:last-child > .table:last-child {
+    @include border-bottom-radius(($panel-border-radius - 1));
+
+    > tbody:last-child,
+    > tfoot:last-child {
+      > tr:last-child {
+        td:first-child,
+        th:first-child {
+          border-bottom-left-radius: ($panel-border-radius - 1);
+        }
+        td:last-child,
+        th:last-child {
+          border-bottom-right-radius: ($panel-border-radius - 1);
+        }
+      }
+    }
+  }
+  > .panel-body + .table,
+  > .panel-body + .table-responsive {
+    border-top: 1px solid $table-border-color;
+  }
+  > .table > tbody:first-child > tr:first-child th,
+  > .table > tbody:first-child > tr:first-child td {
+    border-top: 0;
+  }
+  > .table-bordered,
+  > .table-responsive > .table-bordered {
+    border: 0;
+    > thead,
+    > tbody,
+    > tfoot {
+      > tr {
+        > th:first-child,
+        > td:first-child {
+          border-left: 0;
+        }
+        > th:last-child,
+        > td:last-child {
+          border-right: 0;
+        }
+      }
+    }
+    > thead,
+    > tbody {
+      > tr:first-child {
+        > td,
+        > th {
+          border-bottom: 0;
+        }
+      }
+    }
+    > tbody,
+    > tfoot {
+      > tr:last-child {
+        > td,
+        > th {
+          border-bottom: 0;
+        }
+      }
+    }
+  }
+  > .table-responsive {
+    border: 0;
+    margin-bottom: 0;
+  }
+}
+
+
+// Collapsable panels (aka, accordion)
+//
+// Wrap a series of panels in `.panel-group` to turn them into an accordion with
+// the help of our collapse JavaScript plugin.
+
+.panel-group {
+  margin-bottom: $line-height-computed;
+
+  // Tighten up margin so it's only between panels
+  .panel {
+    margin-bottom: 0;
+    border-radius: $panel-border-radius;
+    + .panel {
+      margin-top: 5px;
+    }
+  }
+
+  .panel-heading {
+    border-bottom: 0;
+    + .panel-collapse > .panel-body {
+      border-top: 1px solid $panel-inner-border;
+    }
+  }
+  .panel-footer {
+    border-top: 0;
+    + .panel-collapse .panel-body {
+      border-bottom: 1px solid $panel-inner-border;
+    }
+  }
+}
+
+
+// Contextual variations
+.panel-default {
+  @include panel-variant($panel-default-border, $panel-default-text, $panel-default-heading-bg, $panel-default-border);
+}
+.panel-primary {
+  @include panel-variant($panel-primary-border, $panel-primary-text, $panel-primary-heading-bg, $panel-primary-border);
+}
+.panel-success {
+  @include panel-variant($panel-success-border, $panel-success-text, $panel-success-heading-bg, $panel-success-border);
+}
+.panel-info {
+  @include panel-variant($panel-info-border, $panel-info-text, $panel-info-heading-bg, $panel-info-border);
+}
+.panel-warning {
+  @include panel-variant($panel-warning-border, $panel-warning-text, $panel-warning-heading-bg, $panel-warning-border);
+}
+.panel-danger {
+  @include panel-variant($panel-danger-border, $panel-danger-text, $panel-danger-heading-bg, $panel-danger-border);
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_popovers.scss b/app/assets/stylesheets/rails_admin/bootstrap/_popovers.scss
old mode 100755
new mode 100644
index 18a1ca0c84..1cf27aed55
--- a/app/assets/stylesheets/rails_admin/bootstrap/_popovers.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_popovers.scss
@@ -7,43 +7,37 @@
   position: absolute;
   top: 0;
   left: 0;
-  z-index: $zindexPopover;
+  z-index: $zindex-popover;
   display: none;
-  max-width: 276px;
+  max-width: $popover-max-width;
   padding: 1px;
   text-align: left; // Reset given new insertion method
-  background-color: $popoverBackground;
-  -webkit-background-clip: padding-box;
-     -moz-background-clip: padding;
-          background-clip: padding-box;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0,0,0,.2);
-  @include border-radius(6px);
+  background-color: $popover-bg;
+  background-clip: padding-box;
+  border: 1px solid $popover-fallback-border-color;
+  border: 1px solid $popover-border-color;
+  border-radius: $border-radius-large;
   @include box-shadow(0 5px 10px rgba(0,0,0,.2));
 
   // Overrides for proper insertion
   white-space: normal;
 
   // Offset the popover to account for the popover arrow
-  &.top     { margin-top: -10px; }
-  &.right   { margin-left: 10px; }
-  &.bottom  { margin-top: 10px; }
-  &.left    { margin-left: -10px; }
+  &.top     { margin-top: -$popover-arrow-width; }
+  &.right   { margin-left: $popover-arrow-width; }
+  &.bottom  { margin-top: $popover-arrow-width; }
+  &.left    { margin-left: -$popover-arrow-width; }
 }
 
 .popover-title {
   margin: 0; // reset heading margin
   padding: 8px 14px;
-  font-size: 14px;
+  font-size: $font-size-base;
   font-weight: normal;
   line-height: 18px;
-  background-color: $popoverTitleBackground;
-  border-bottom: 1px solid darken($popoverTitleBackground, 5%);
-  @include border-radius(5px 5px 0 0);
-
-  &:empty {
-    display: none;
-  }
+  background-color: $popover-title-bg;
+  border-bottom: 1px solid darken($popover-title-bg, 5%);
+  border-radius: ($border-radius-large - 1) ($border-radius-large - 1) 0 0;
 }
 
 .popover-content {
@@ -54,79 +48,85 @@
 //
 // .arrow is outer, .arrow:after is inner
 
-.popover .arrow,
-.popover .arrow:after {
-  position: absolute;
-  display: block;
-  width: 0;
-  height: 0;
-  border-color: transparent;
-  border-style: solid;
+.popover > .arrow {
+  &,
+  &:after {
+    position: absolute;
+    display: block;
+    width: 0;
+    height: 0;
+    border-color: transparent;
+    border-style: solid;
+  }
 }
-.popover .arrow {
-  border-width: $popoverArrowOuterWidth;
+.popover > .arrow {
+  border-width: $popover-arrow-outer-width;
 }
-.popover .arrow:after {
-  border-width: $popoverArrowWidth;
+.popover > .arrow:after {
+  border-width: $popover-arrow-width;
   content: "";
 }
 
 .popover {
-  &.top .arrow {
+  &.top > .arrow {
     left: 50%;
-    margin-left: -$popoverArrowOuterWidth;
+    margin-left: -$popover-arrow-outer-width;
     border-bottom-width: 0;
-    border-top-color: #999; // IE8 fallback
-    border-top-color: $popoverArrowOuterColor;
-    bottom: -$popoverArrowOuterWidth;
+    border-top-color: $popover-arrow-outer-fallback-color; // IE8 fallback
+    border-top-color: $popover-arrow-outer-color;
+    bottom: -$popover-arrow-outer-width;
     &:after {
+      content: " ";
       bottom: 1px;
-      margin-left: -$popoverArrowWidth;
+      margin-left: -$popover-arrow-width;
       border-bottom-width: 0;
-      border-top-color: $popoverArrowColor;
+      border-top-color: $popover-arrow-color;
     }
   }
-  &.right .arrow {
+  &.right > .arrow {
     top: 50%;
-    left: -$popoverArrowOuterWidth;
-    margin-top: -$popoverArrowOuterWidth;
+    left: -$popover-arrow-outer-width;
+    margin-top: -$popover-arrow-outer-width;
     border-left-width: 0;
-    border-right-color: #999; // IE8 fallback
-    border-right-color: $popoverArrowOuterColor;
+    border-right-color: $popover-arrow-outer-fallback-color; // IE8 fallback
+    border-right-color: $popover-arrow-outer-color;
     &:after {
+      content: " ";
       left: 1px;
-      bottom: -$popoverArrowWidth;
+      bottom: -$popover-arrow-width;
       border-left-width: 0;
-      border-right-color: $popoverArrowColor;
+      border-right-color: $popover-arrow-color;
     }
   }
-  &.bottom .arrow {
+  &.bottom > .arrow {
     left: 50%;
-    margin-left: -$popoverArrowOuterWidth;
+    margin-left: -$popover-arrow-outer-width;
     border-top-width: 0;
-    border-bottom-color: #999; // IE8 fallback
-    border-bottom-color: $popoverArrowOuterColor;
-    top: -$popoverArrowOuterWidth;
+    border-bottom-color: $popover-arrow-outer-fallback-color; // IE8 fallback
+    border-bottom-color: $popover-arrow-outer-color;
+    top: -$popover-arrow-outer-width;
     &:after {
+      content: " ";
       top: 1px;
-      margin-left: -$popoverArrowWidth;
+      margin-left: -$popover-arrow-width;
       border-top-width: 0;
-      border-bottom-color: $popoverArrowColor;
+      border-bottom-color: $popover-arrow-color;
     }
   }
 
-  &.left .arrow {
+  &.left > .arrow {
     top: 50%;
-    right: -$popoverArrowOuterWidth;
-    margin-top: -$popoverArrowOuterWidth;
+    right: -$popover-arrow-outer-width;
+    margin-top: -$popover-arrow-outer-width;
     border-right-width: 0;
-    border-left-color: #999; // IE8 fallback
-    border-left-color: $popoverArrowOuterColor;
+    border-left-color: $popover-arrow-outer-fallback-color; // IE8 fallback
+    border-left-color: $popover-arrow-outer-color;
     &:after {
+      content: " ";
       right: 1px;
       border-right-width: 0;
-      border-left-color: $popoverArrowColor;
-      bottom: -$popoverArrowWidth;
+      border-left-color: $popover-arrow-color;
+      bottom: -$popover-arrow-width;
     }
   }
 
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_print.scss b/app/assets/stylesheets/rails_admin/bootstrap/_print.scss
new file mode 100644
index 0000000000..3655d03953
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_print.scss
@@ -0,0 +1,101 @@
+//
+// Basic print styles
+// --------------------------------------------------
+// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css
+
+@media print {
+
+  * {
+    text-shadow: none !important;
+    color: #000 !important; // Black prints faster: h5bp.com/s
+    background: transparent !important;
+    box-shadow: none !important;
+  }
+
+  a,
+  a:visited {
+    text-decoration: underline;
+  }
+
+  a[href]:after {
+    content: " (" attr(href) ")";
+  }
+
+  abbr[title]:after {
+    content: " (" attr(title) ")";
+  }
+
+  // Don't show links for images, or javascript/internal links
+  a[href^="javascript:"]:after,
+  a[href^="#"]:after {
+    content: "";
+  }
+
+  pre,
+  blockquote {
+    border: 1px solid #999;
+    page-break-inside: avoid;
+  }
+
+  thead {
+    display: table-header-group; // h5bp.com/t
+  }
+
+  tr,
+  img {
+    page-break-inside: avoid;
+  }
+
+  img {
+    max-width: 100% !important;
+  }
+
+  p,
+  h2,
+  h3 {
+    orphans: 3;
+    widows: 3;
+  }
+
+  h2,
+  h3 {
+    page-break-after: avoid;
+  }
+
+  // Chrome (OSX) fix for https://github.com/twbs/bootstrap/issues/11245
+  // Once fixed, we can just straight up remove this.
+  select {
+    background: #fff !important;
+  }
+
+  // Bootstrap components
+  .navbar {
+    display: none;
+  }
+  .table {
+    td,
+    th {
+      background-color: #fff !important;
+    }
+  }
+  .btn,
+  .dropup > .btn {
+    > .caret {
+      border-top-color: #000 !important;
+    }
+  }
+  .label {
+    border: 1px solid #000;
+  }
+
+  .table {
+    border-collapse: collapse !important;
+  }
+  .table-bordered {
+    th,
+    td {
+      border: 1px solid #ddd !important;
+    }
+  }
+
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_progress-bars.scss b/app/assets/stylesheets/rails_admin/bootstrap/_progress-bars.scss
old mode 100755
new mode 100644
index 6d9e70b24e..6395ac2289
--- a/app/assets/stylesheets/rails_admin/bootstrap/_progress-bars.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_progress-bars.scss
@@ -3,34 +3,16 @@
 // --------------------------------------------------
 
 
-// ANIMATIONS
-// ----------
+// Bar animations
+// -------------------------
 
-// Webkit
+// WebKit
 @-webkit-keyframes progress-bar-stripes {
   from  { background-position: 40px 0; }
   to    { background-position: 0 0; }
 }
 
-// Firefox
-@-moz-keyframes progress-bar-stripes {
-  from  { background-position: 40px 0; }
-  to    { background-position: 0 0; }
-}
-
-// IE9
-@-ms-keyframes progress-bar-stripes {
-  from  { background-position: 40px 0; }
-  to    { background-position: 0 0; }
-}
-
-// Opera
-@-o-keyframes progress-bar-stripes {
-  from  { background-position: 0 0; }
-  to    { background-position: 40px 0; }
-}
-
-// Spec
+// Spec and IE10+
 @keyframes progress-bar-stripes {
   from  { background-position: 40px 0; }
   to    { background-position: 0 0; }
@@ -38,85 +20,86 @@
 
 
 
-// THE BARS
-// --------
+// Bar itself
+// -------------------------
 
 // Outer container
 .progress {
   overflow: hidden;
-  height: $baseLineHeight;
-  margin-bottom: $baseLineHeight;
-  @include gradient-vertical(#f5f5f5, #f9f9f9);
+  height: $line-height-computed;
+  margin-bottom: $line-height-computed;
+  background-color: $progress-bg;
+  border-radius: $border-radius-base;
   @include box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
-  @include border-radius($baseBorderRadius);
 }
 
 // Bar of progress
-.progress .bar {
+.progress-bar {
+  float: left;
   width: 0%;
   height: 100%;
-  color: $white;
-  float: left;
-  font-size: 12px;
+  font-size: $font-size-small;
+  line-height: $line-height-computed;
+  color: $progress-bar-color;
   text-align: center;
-  text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-  @include gradient-vertical(#149bdf, #0480be);
+  background-color: $progress-bar-bg;
   @include box-shadow(inset 0 -1px 0 rgba(0,0,0,.15));
-  @include box-sizing(border-box);
   @include transition(width .6s ease);
 }
-.progress .bar + .bar {
-  @include box-shadow(inset 1px 0 0 rgba(0,0,0,.15), inset 0 -1px 0 rgba(0,0,0,.15));
-}
 
 // Striped bars
-.progress-striped .bar {
-  @include gradient-striped(#149bdf);
-  @include background-size(40px 40px);
+//
+// `.progress-striped .progress-bar` is deprecated as of v3.2.0 in favor of the
+// `.progress-bar-striped` class, which you just add to an existing
+// `.progress-bar`.
+.progress-striped .progress-bar,
+.progress-bar-striped {
+  @include gradient-striped();
+  background-size: 40px 40px;
 }
 
 // Call animation for the active one
-.progress.active .bar {
-  -webkit-animation: progress-bar-stripes 2s linear infinite;
-     -moz-animation: progress-bar-stripes 2s linear infinite;
-      -ms-animation: progress-bar-stripes 2s linear infinite;
-       -o-animation: progress-bar-stripes 2s linear infinite;
-          animation: progress-bar-stripes 2s linear infinite;
+//
+// `.progress.active .progress-bar` is deprecated as of v3.2.0 in favor of the
+// `.progress-bar.active` approach.
+.progress.active .progress-bar,
+.progress-bar.active {
+  @include animation(progress-bar-stripes 2s linear infinite);
 }
 
+// Account for lower percentages
+.progress-bar {
+  &[aria-valuenow="1"],
+  &[aria-valuenow="2"] {
+    min-width: 30px;
+  }
 
+  &[aria-valuenow="0"] {
+    color: $gray-light;
+    min-width: 30px;
+    background-color: transparent;
+    background-image: none;
+    box-shadow: none;
+  }
+}
 
-// COLORS
-// ------
 
-// Danger (red)
-.progress-danger .bar, .progress .bar-danger {
-  @include gradient-vertical(#ee5f5b, #c43c35);
-}
-.progress-danger.progress-striped .bar, .progress-striped .bar-danger {
-  @include gradient-striped(#ee5f5b);
-}
 
-// Success (green)
-.progress-success .bar, .progress .bar-success {
-  @include gradient-vertical(#62c462, #57a957);
-}
-.progress-success.progress-striped .bar, .progress-striped .bar-success {
-  @include gradient-striped(#62c462);
-}
+// Variations
+// -------------------------
 
-// Info (teal)
-.progress-info .bar, .progress .bar-info {
-  @include gradient-vertical(#5bc0de, #339bb9);
+.progress-bar-success {
+  @include progress-bar-variant($progress-bar-success-bg);
 }
-.progress-info.progress-striped .bar, .progress-striped .bar-info {
-  @include gradient-striped(#5bc0de);
+
+.progress-bar-info {
+  @include progress-bar-variant($progress-bar-info-bg);
 }
 
-// Warning (orange)
-.progress-warning .bar, .progress .bar-warning {
-  @include gradient-vertical(lighten($orange, 15%), $orange);
+.progress-bar-warning {
+  @include progress-bar-variant($progress-bar-warning-bg);
 }
-.progress-warning.progress-striped .bar, .progress-striped .bar-warning {
-  @include gradient-striped(lighten($orange, 15%));
+
+.progress-bar-danger {
+  @include progress-bar-variant($progress-bar-danger-bg);
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_reset.scss b/app/assets/stylesheets/rails_admin/bootstrap/_reset.scss
deleted file mode 100755
index 2f0f029cab..0000000000
--- a/app/assets/stylesheets/rails_admin/bootstrap/_reset.scss
+++ /dev/null
@@ -1,216 +0,0 @@
-//
-// Reset CSS
-// Adapted from http://github.com/necolas/normalize.css
-// --------------------------------------------------
-
-
-// Display in IE6-9 and FF3
-// -------------------------
-
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-nav,
-section {
-  display: block;
-}
-
-// Display block in IE6-9 and FF3
-// -------------------------
-
-audio,
-canvas,
-video {
-  display: inline-block;
-  *display: inline;
-  *zoom: 1;
-}
-
-// Prevents modern browsers from displaying 'audio' without controls
-// -------------------------
-
-audio:not([controls]) {
-    display: none;
-}
-
-// Base settings
-// -------------------------
-
-html {
-  font-size: 100%;
-  -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-}
-// Focus states
-a:focus {
-  @include tab-focus();
-}
-// Hover & Active
-a:hover,
-a:active {
-  outline: 0;
-}
-
-// Prevents sub and sup affecting line-height in all browsers
-// -------------------------
-
-sub,
-sup {
-  position: relative;
-  font-size: 75%;
-  line-height: 0;
-  vertical-align: baseline;
-}
-sup {
-  top: -0.5em;
-}
-sub {
-  bottom: -0.25em;
-}
-
-// Img border in a's and image quality
-// -------------------------
-
-img {
-  /* Responsive images (ensure images don't scale beyond their parents) */
-  max-width: 100%; /* Part 1: Set a maxium relative to the parent */
-  width: auto\9; /* IE7-8 need help adjusting responsive images */
-  height: auto; /* Part 2: Scale the height according to the width, otherwise you get stretching */
-
-  vertical-align: middle;
-  border: 0;
-  -ms-interpolation-mode: bicubic;
-}
-
-// Prevent max-width from affecting Google Maps
-#map_canvas img,
-.google-maps img {
-  max-width: none;
-}
-
-// Forms
-// -------------------------
-
-// Font size in all browsers, margin changes, misc consistency
-button,
-input,
-select,
-textarea {
-  margin: 0;
-  font-size: 100%;
-  vertical-align: middle;
-}
-button,
-input {
-  *overflow: visible; // Inner spacing ie IE6/7
-  line-height: normal; // FF3/4 have !important on line-height in UA stylesheet
-}
-button::-moz-focus-inner,
-input::-moz-focus-inner { // Inner padding and border oddities in FF3/4
-  padding: 0;
-  border: 0;
-}
-button,
-html input[type="button"], // Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` and `video` controls.
-input[type="reset"],
-input[type="submit"] {
-    -webkit-appearance: button; // Corrects inability to style clickable `input` types in iOS.
-    cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others.
-}
-label,
-select,
-button,
-input[type="button"],
-input[type="reset"],
-input[type="submit"],
-input[type="radio"],
-input[type="checkbox"] {
-    cursor: pointer; // Improves usability and consistency of cursor style between image-type `input` and others.
-}
-input[type="search"] { // Appearance in Safari/Chrome
-  @include box-sizing(content-box);
-  -webkit-appearance: textfield;
-}
-input[type="search"]::-webkit-search-decoration,
-input[type="search"]::-webkit-search-cancel-button {
-  -webkit-appearance: none; // Inner-padding issues in Chrome OSX, Safari 5
-}
-textarea {
-  overflow: auto; // Remove vertical scrollbar in IE6-9
-  vertical-align: top; // Readability and alignment cross-browser
-}
-
-
-// Printing
-// -------------------------
-// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css
-
-@media print {
-
-  * {
-    text-shadow: none !important;
-    color: #000 !important; // Black prints faster: h5bp.com/s
-    background: transparent !important;
-    box-shadow: none !important;
-  }
-
-  a,
-  a:visited {
-    text-decoration: underline;
-  }
-
-  a[href]:after {
-    content: " (" attr(href) ")";
-  }
-
-  abbr[title]:after {
-    content: " (" attr(title) ")";
-  }
-
-  // Don't show links for images, or javascript/internal links
-  .ir a:after,
-  a[href^="javascript:"]:after,
-  a[href^="#"]:after {
-    content: "";
-  }
-
-  pre,
-  blockquote {
-    border: 1px solid #999;
-    page-break-inside: avoid;
-  }
-
-  thead {
-    display: table-header-group; // h5bp.com/t
-  }
-
-  tr,
-  img {
-    page-break-inside: avoid;
-  }
-
-  img {
-    max-width: 100% !important;
-  }
-
-  @page {
-    margin: 0.5cm;
-  }
-
-  p,
-  h2,
-  h3 {
-    orphans: 3;
-    widows: 3;
-  }
-
-  h2,
-  h3 {
-    page-break-after: avoid;
-  }
-}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_responsive-1200px-min.scss b/app/assets/stylesheets/rails_admin/bootstrap/_responsive-1200px-min.scss
deleted file mode 100755
index be54ccc405..0000000000
--- a/app/assets/stylesheets/rails_admin/bootstrap/_responsive-1200px-min.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-//
-// Responsive: Large desktop and up
-// --------------------------------------------------
-
-
-@media (min-width: 1200px) {
-
-  // Fixed grid
-  @include grid-core($gridColumnWidth1200, $gridGutterWidth1200);
-
-  // Fluid grid
-  @include grid-fluid($fluidGridColumnWidth1200, $fluidGridGutterWidth1200);
-
-  // Input grid
-  @include grid-input($gridColumnWidth1200, $gridGutterWidth1200);
-
-  // Thumbnails
-  .thumbnails {
-    margin-left: -$gridGutterWidth1200;
-  }
-  .thumbnails > li {
-    margin-left: $gridGutterWidth1200;
-  }
-  .row-fluid .thumbnails {
-    margin-left: 0;
-  }
-
-}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_responsive-767px-max.scss b/app/assets/stylesheets/rails_admin/bootstrap/_responsive-767px-max.scss
deleted file mode 100755
index 54bf3b7c09..0000000000
--- a/app/assets/stylesheets/rails_admin/bootstrap/_responsive-767px-max.scss
+++ /dev/null
@@ -1,193 +0,0 @@
-//
-// Responsive: Landscape phone to desktop/tablet
-// --------------------------------------------------
-
-
-@media (max-width: 767px) {
-
-  // Padding to set content in a bit
-  body {
-    padding-left: 20px;
-    padding-right: 20px;
-  }
-  // Negative indent the now static "fixed" navbar
-  .navbar-fixed-top,
-  .navbar-fixed-bottom,
-  .navbar-static-top {
-    margin-left: -20px;
-    margin-right: -20px;
-  }
-  // Remove padding on container given explicit padding set on body
-  .container-fluid {
-    padding: 0;
-  }
-
-  // TYPOGRAPHY
-  // ----------
-  // Reset horizontal dl
-  .dl-horizontal {
-    dt {
-      float: none;
-      clear: none;
-      width: auto;
-      text-align: left;
-    }
-    dd {
-      margin-left: 0;
-    }
-  }
-
-  // GRID & CONTAINERS
-  // -----------------
-  // Remove width from containers
-  .container {
-    width: auto;
-  }
-  // Fluid rows
-  .row-fluid {
-    width: 100%;
-  }
-  // Undo negative margin on rows and thumbnails
-  .row,
-  .thumbnails {
-    margin-left: 0;
-  }
-  .thumbnails > li {
-    float: none;
-    margin-left: 0; // Reset the default margin for all li elements when no .span* classes are present
-  }
-  // Make all grid-sized elements block level again
-  [class*="span"],
-  .uneditable-input[class*="span"], // Makes uneditable inputs full-width when using grid sizing
-  .row-fluid [class*="span"] {
-    float: none;
-    display: block;
-    width: 100%;
-    margin-left: 0;
-    @include box-sizing(border-box);
-  }
-  .span12,
-  .row-fluid .span12 {
-    width: 100%;
-    @include box-sizing(border-box);
-  }
-  .row-fluid [class*="offset"]:first-child {
-    margin-left: 0;
-  }
-
-  // FORM FIELDS
-  // -----------
-  // Make span* classes full width
-  .input-large,
-  .input-xlarge,
-  .input-xxlarge,
-  input[class*="span"],
-  select[class*="span"],
-  textarea[class*="span"],
-  .uneditable-input {
-    @include input-block-level();
-  }
-  // But don't let it screw up prepend/append inputs
-  .input-prepend input,
-  .input-append input,
-  .input-prepend input[class*="span"],
-  .input-append input[class*="span"] {
-    display: inline-block; // redeclare so they don't wrap to new lines
-    width: auto;
-  }
-  .controls-row [class*="span"] + [class*="span"] {
-    margin-left: 0;
-  }
-
-  // Modals
-  .modal {
-    position: fixed;
-    top:   20px;
-    left:  20px;
-    right: 20px;
-    width: auto;
-    margin: 0;
-    &.fade  { top: -100px; }
-    &.fade.in { top: 20px; }
-  }
-
-}
-
-
-
-// UP TO LANDSCAPE PHONE
-// ---------------------
-
-@media (max-width: 480px) {
-
-  // Smooth out the collapsing/expanding nav
-  .nav-collapse {
-    -webkit-transform: translate3d(0, 0, 0); // activate the GPU
-  }
-
-  // Block level the page header small tag for readability
-  .page-header h1 small {
-    display: block;
-    line-height: $baseLineHeight;
-  }
-
-  // Update checkboxes for iOS
-  input[type="checkbox"],
-  input[type="radio"] {
-    border: 1px solid #ccc;
-  }
-
-  // Remove the horizontal form styles
-  .form-horizontal {
-    .control-label {
-      float: none;
-      width: auto;
-      padding-top: 0;
-      text-align: left;
-    }
-    // Move over all input controls and content
-    .controls {
-      margin-left: 0;
-    }
-    // Move the options list down to align with labels
-    .control-list {
-      padding-top: 0; // has to be padding because margin collaspes
-    }
-    // Move over buttons in .form-actions to align with .controls
-    .form-actions {
-      padding-left: 10px;
-      padding-right: 10px;
-    }
-  }
-
-  // Medias
-  // Reset float and spacing to stack
-  .media .pull-left,
-  .media .pull-right  {
-    float: none;
-    display: block;
-    margin-bottom: 10px;
-  }
-  // Remove side margins since we stack instead of indent
-  .media-object {
-    margin-right: 0;
-    margin-left: 0;
-  }
-
-  // Modals
-  .modal {
-    top:   10px;
-    left:  10px;
-    right: 10px;
-  }
-  .modal-header .close {
-    padding: 10px;
-    margin: -10px;
-  }
-
-  // Carousel
-  .carousel-caption {
-    position: static;
-  }
-
-}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_responsive-768px-979px.scss b/app/assets/stylesheets/rails_admin/bootstrap/_responsive-768px-979px.scss
deleted file mode 100755
index 1ae409fd6c..0000000000
--- a/app/assets/stylesheets/rails_admin/bootstrap/_responsive-768px-979px.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Responsive: Tablet to desktop
-// --------------------------------------------------
-
-
-@media (min-width: 768px) and (max-width: 979px) {
-
-  // Fixed grid
-  @include grid-core($gridColumnWidth768, $gridGutterWidth768);
-
-  // Fluid grid
-  @include grid-fluid($fluidGridColumnWidth768, $fluidGridGutterWidth768);
-
-  // Input grid
-  @include grid-input($gridColumnWidth768, $gridGutterWidth768);
-
-  // No need to reset .thumbnails here since it's the same $gridGutterWidth
-
-}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_responsive-embed.scss b/app/assets/stylesheets/rails_admin/bootstrap/_responsive-embed.scss
new file mode 100644
index 0000000000..a884d49fed
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_responsive-embed.scss
@@ -0,0 +1,34 @@
+// Embeds responsive
+//
+// Credit: Nicolas Gallagher and SUIT CSS.
+
+.embed-responsive {
+  position: relative;
+  display: block;
+  height: 0;
+  padding: 0;
+  overflow: hidden;
+
+  .embed-responsive-item,
+  iframe,
+  embed,
+  object {
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    height: 100%;
+    width: 100%;
+    border: 0;
+  }
+
+  // Modifier class for 16:9 aspect ratio
+  &.embed-responsive-16by9 {
+    padding-bottom: 56.25%;
+  }
+
+  // Modifier class for 4:3 aspect ratio
+  &.embed-responsive-4by3 {
+    padding-bottom: 75%;
+  }
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_responsive-navbar.scss b/app/assets/stylesheets/rails_admin/bootstrap/_responsive-navbar.scss
deleted file mode 100755
index 9898a16eb4..0000000000
--- a/app/assets/stylesheets/rails_admin/bootstrap/_responsive-navbar.scss
+++ /dev/null
@@ -1,189 +0,0 @@
-//
-// Responsive: Navbar
-// --------------------------------------------------
-
-
-// TABLETS AND BELOW
-// -----------------
-@media (max-width: $navbarCollapseWidth) {
-
-  // UNFIX THE TOPBAR
-  // ----------------
-  // Remove any padding from the body
-  body {
-    padding-top: 0;
-  }
-  // Unfix the navbars
-  .navbar-fixed-top,
-  .navbar-fixed-bottom {
-    position: static;
-  }
-  .navbar-fixed-top {
-    margin-bottom: $baseLineHeight;
-  }
-  .navbar-fixed-bottom {
-    margin-top: $baseLineHeight;
-  }
-  .navbar-fixed-top .navbar-inner,
-  .navbar-fixed-bottom .navbar-inner {
-    padding: 5px;
-  }
-  .navbar .container {
-    width: auto;
-    padding: 0;
-  }
-  // Account for brand name
-  .navbar .brand {
-    padding-left: 10px;
-    padding-right: 10px;
-    margin: 0 0 0 -5px;
-  }
-
-  // COLLAPSIBLE NAVBAR
-  // ------------------
-  // Nav collapse clears brand
-  .nav-collapse {
-    clear: both;
-  }
-  // Block-level the nav
-  .nav-collapse .nav {
-    float: none;
-    margin: 0 0 ($baseLineHeight / 2);
-  }
-  .nav-collapse .nav > li {
-    float: none;
-  }
-  .nav-collapse .nav > li > a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > .divider-vertical {
-    display: none;
-  }
-  .nav-collapse .nav .nav-header {
-    color: $navbarText;
-    text-shadow: none;
-  }
-  // Nav and dropdown links in navbar
-  .nav-collapse .nav > li > a,
-  .nav-collapse .dropdown-menu a {
-    padding: 9px 15px;
-    font-weight: bold;
-    color: $navbarLinkColor;
-    @include border-radius(3px);
-  }
-  // Buttons
-  .nav-collapse .btn {
-    padding: 4px 10px 4px;
-    font-weight: normal;
-    @include border-radius($baseBorderRadius);
-  }
-  .nav-collapse .dropdown-menu li + li a {
-    margin-bottom: 2px;
-  }
-  .nav-collapse .nav > li > a:hover,
-  .nav-collapse .nav > li > a:focus,
-  .nav-collapse .dropdown-menu a:hover,
-  .nav-collapse .dropdown-menu a:focus {
-    background-color: $navbarBackground;
-  }
-  .navbar-inverse .nav-collapse .nav > li > a,
-  .navbar-inverse .nav-collapse .dropdown-menu a {
-    color: $navbarInverseLinkColor;
-  }
-  .navbar-inverse .nav-collapse .nav > li > a:hover,
-  .navbar-inverse .nav-collapse .nav > li > a:focus,
-  .navbar-inverse .nav-collapse .dropdown-menu a:hover,
-  .navbar-inverse .nav-collapse .dropdown-menu a:focus {
-    background-color: $navbarInverseBackground;
-  }
-  // Buttons in the navbar
-  .nav-collapse.in .btn-group {
-    margin-top: 5px;
-    padding: 0;
-  }
-  // Dropdowns in the navbar
-  .nav-collapse .dropdown-menu {
-    position: static;
-    top: auto;
-    left: auto;
-    float: none;
-    display: none;
-    max-width: none;
-    margin: 0 15px;
-    padding: 0;
-    background-color: transparent;
-    border: none;
-    @include border-radius(0);
-    @include box-shadow(none);
-  }
-  .nav-collapse .open > .dropdown-menu {
-    display: block;
-  }
-
-  .nav-collapse .dropdown-menu:before,
-  .nav-collapse .dropdown-menu:after {
-    display: none;
-  }
-  .nav-collapse .dropdown-menu .divider {
-    display: none;
-  }
-  .nav-collapse .nav > li > .dropdown-menu {
-    &:before,
-    &:after {
-      display: none;
-    }
-  }
-  // Forms in navbar
-  .nav-collapse .navbar-form,
-  .nav-collapse .navbar-search {
-    float: none;
-    padding: ($baseLineHeight / 2) 15px;
-    margin: ($baseLineHeight / 2) 0;
-    border-top: 1px solid $navbarBackground;
-    border-bottom: 1px solid $navbarBackground;
-    @include box-shadow(inset 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(255,255,255,.1));
-  }
-  .navbar-inverse .nav-collapse .navbar-form,
-  .navbar-inverse .nav-collapse .navbar-search {
-    border-top-color: $navbarInverseBackground;
-    border-bottom-color: $navbarInverseBackground;
-  }
-  // Pull right (secondary) nav content
-  .navbar .nav-collapse .nav.pull-right {
-    float: none;
-    margin-left: 0;
-  }
-  // Hide everything in the navbar save .brand and toggle button */
-  .nav-collapse,
-  .nav-collapse.collapse {
-    overflow: hidden;
-    height: 0;
-  }
-  // Navbar button
-  .navbar .btn-navbar {
-    display: block;
-  }
-
-  // STATIC NAVBAR
-  // -------------
-  .navbar-static .navbar-inner {
-    padding-left:  10px;
-    padding-right: 10px;
-  }
-
-
-}
-
-
-// DEFAULT DESKTOP
-// ---------------
-
-@media (min-width: $navbarCollapseDesktopWidth) {
-
-  // Required to make the collapsing navbar work on regular desktops
-  .nav-collapse.collapse {
-    height: auto !important;
-    overflow: visible !important;
-  }
-
-}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_responsive-utilities.scss b/app/assets/stylesheets/rails_admin/bootstrap/_responsive-utilities.scss
old mode 100755
new mode 100644
index 689b265052..4d9e13b598
--- a/app/assets/stylesheets/rails_admin/bootstrap/_responsive-utilities.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_responsive-utilities.scss
@@ -3,72 +3,172 @@
 // --------------------------------------------------
 
 
-// IE10 Metro responsive
-// Required for Windows 8 Metro split-screen snapping with IE10
+// IE10 in Windows (Phone) 8
+//
+// Support for responsive views via media queries is kind of borked in IE10, for
+// Surface/desktop in split view and for Windows Phone 8. This particular fix
+// must be accompanied by a snippet of JavaScript to sniff the user agent and
+// apply some conditional CSS to *only* the Surface/desktop Windows 8. Look at
+// our Getting Started page for more information on this bug.
+//
+// For more information, see the following:
+//
+// Issue: https://github.com/twbs/bootstrap/issues/10497
+// Docs: http://getbootstrap.com/getting-started/#support-ie10-width
+// Source: http://timkadlec.com/2013/01/windows-phone-8-and-device-width/
 // Source: http://timkadlec.com/2012/10/ie10-snap-mode-and-responsive-design/
-@-ms-viewport{
+
+@-ms-viewport {
   width: device-width;
 }
 
-// Hide from screenreaders and browsers
-// Credit: HTML5 Boilerplate
-.hidden {
-  display: none;
-  visibility: hidden;
-}
 
 // Visibility utilities
+// Note: Deprecated .visible-xs, .visible-sm, .visible-md, and .visible-lg as of v3.2.0
+
+@include responsive-invisibility('.visible-xs, .visible-sm, .visible-md, .visible-lg');
 
-// For desktops
-.visible-phone     { display: none !important; }
-.visible-tablet    { display: none !important; }
-.hidden-phone      { }
-.hidden-tablet     { }
-.hidden-desktop    { display: none !important; }
-.visible-desktop   { display: inherit !important; }
-
-// Tablets & small desktops only
-@media (min-width: 768px) and (max-width: 979px) {
-  // Hide everything else
-  .hidden-desktop    { display: inherit !important; }
-  .visible-desktop   { display: none !important ; }
-  // Show
-  .visible-tablet    { display: inherit !important; }
-  // Hide
-  .hidden-tablet     { display: none !important; }
-}
-
-// Phones only
-@media (max-width: 767px) {
-  // Hide everything else
-  .hidden-desktop    { display: inherit !important; }
-  .visible-desktop   { display: none !important; }
-  // Show
-  .visible-phone     { display: inherit !important; } // Use inherit to restore previous behavior
-  // Hide
-  .hidden-phone      { display: none !important; }
+.visible-xs-block,
+.visible-xs-inline,
+.visible-xs-inline-block,
+.visible-sm-block,
+.visible-sm-inline,
+.visible-sm-inline-block,
+.visible-md-block,
+.visible-md-inline,
+.visible-md-inline-block,
+.visible-lg-block,
+.visible-lg-inline,
+.visible-lg-inline-block {
+  display: none !important;
+}
+
+@media (max-width: $screen-xs-max) {
+  @include responsive-visibility('.visible-xs');
+}
+.visible-xs-block {
+  @media (max-width: $screen-xs-max) {
+    display: block !important;
+  }
+}
+.visible-xs-inline {
+  @media (max-width: $screen-xs-max) {
+    display: inline !important;
+  }
+}
+.visible-xs-inline-block {
+  @media (max-width: $screen-xs-max) {
+    display: inline-block !important;
+  }
+}
+
+@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+  @include responsive-visibility('.visible-sm');
+}
+.visible-sm-block {
+  @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+    display: block !important;
+  }
+}
+.visible-sm-inline {
+  @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+    display: inline !important;
+  }
+}
+.visible-sm-inline-block {
+  @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+    display: inline-block !important;
+  }
+}
+
+@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
+  @include responsive-visibility('.visible-md');
+}
+.visible-md-block {
+  @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
+    display: block !important;
+  }
+}
+.visible-md-inline {
+  @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
+    display: inline !important;
+  }
+}
+.visible-md-inline-block {
+  @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
+    display: inline-block !important;
+  }
 }
 
+@media (min-width: $screen-lg-min) {
+  @include responsive-visibility('.visible-lg');
+}
+.visible-lg-block {
+  @media (min-width: $screen-lg-min) {
+    display: block !important;
+  }
+}
+.visible-lg-inline {
+  @media (min-width: $screen-lg-min) {
+    display: inline !important;
+  }
+}
+.visible-lg-inline-block {
+  @media (min-width: $screen-lg-min) {
+    display: inline-block !important;
+  }
+}
+
+@media (max-width: $screen-xs-max) {
+  @include responsive-invisibility('.hidden-xs');
+}
+
+@media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+  @include responsive-invisibility('.hidden-sm');
+}
+
+@media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
+  @include responsive-invisibility('.hidden-md');
+}
+
+@media (min-width: $screen-lg-min) {
+  @include responsive-invisibility('.hidden-lg');
+}
+
+
 // Print utilities
-.visible-print    { display: none !important; }
-.hidden-print     { }
+//
+// Media queries are placed on the inside to be mixin-friendly.
+
+// Note: Deprecated .visible-print as of v3.2.0
+
+@include responsive-invisibility('.visible-print');
 
 @media print {
-  .visible-print  { display: inherit !important; }
-  .hidden-print   { display: none !important; }
+  @include responsive-visibility('.visible-print');
 }
+.visible-print-block {
+  display: none !important;
 
-// Clearing floats
-.clearfix {
-  @include clearfix();
+  @media print {
+    display: block !important;
+  }
 }
+.visible-print-inline {
+  display: none !important;
 
-// Accessible yet invisible text
-.hide-text {
-  @include hide-text();
+  @media print {
+    display: inline !important;
+  }
 }
+.visible-print-inline-block {
+  display: none !important;
 
-// Uses box-sizing mixin, so must be defined here
-.input-block-level {
-  @include input-block-level();
+  @media print {
+    display: inline-block !important;
+  }
+}
+
+@media print {
+  @include responsive-invisibility('.hidden-print');
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_scaffolding.scss b/app/assets/stylesheets/rails_admin/bootstrap/_scaffolding.scss
old mode 100755
new mode 100644
index 23d4a00fc1..8cea4cdc3f
--- a/app/assets/stylesheets/rails_admin/bootstrap/_scaffolding.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_scaffolding.scss
@@ -3,51 +3,148 @@
 // --------------------------------------------------
 
 
+// Reset the box-sizing
+//
+// Heads up! This reset may cause conflicts with some third-party widgets.
+// For recommendations on resolving such conflicts, see
+// http://getbootstrap.com/getting-started/#third-box-sizing
+* {
+  @include box-sizing(border-box);
+}
+*:before,
+*:after {
+  @include box-sizing(border-box);
+}
+
+
 // Body reset
-// -------------------------
+
+html {
+  font-size: 10px;
+  -webkit-tap-highlight-color: rgba(0,0,0,0);
+}
 
 body {
-  margin: 0;
-  font-family: $baseFontFamily;
-  font-size: $baseFontSize;
-  line-height: $baseLineHeight;
-  color: $textColor;
-  background-color: $bodyBackground;
+  font-family: $font-family-base;
+  font-size: $font-size-base;
+  line-height: $line-height-base;
+  color: $text-color;
+  background-color: $body-bg;
+}
+
+// Reset fonts for relevant elements
+input,
+button,
+select,
+textarea {
+  font-family: inherit;
+  font-size: inherit;
+  line-height: inherit;
 }
 
 
 // Links
-// -------------------------
 
 a {
-  color: $linkColor;
+  color: $link-color;
   text-decoration: none;
+
+  &:hover,
+  &:focus {
+    color: $link-hover-color;
+    text-decoration: underline;
+  }
+
+  &:focus {
+    @include tab-focus();
+  }
 }
-a:hover,
-a:focus {
-  color: $linkColorHover;
-  text-decoration: underline;
+
+
+// Figures
+//
+// We reset this here because previously Normalize had no `figure` margins. This
+// ensures we don't break anyone's use of the element.
+
+figure {
+  margin: 0;
 }
 
 
 // Images
-// -------------------------
+
+img {
+  vertical-align: middle;
+}
+
+// Responsive images (ensure images don't scale beyond their parents)
+.img-responsive {
+  @include img-responsive();
+}
 
 // Rounded corners
 .img-rounded {
-  @include border-radius(6px);
+  border-radius: $border-radius-large;
 }
 
-// Add polaroid-esque trim
-.img-polaroid {
-  padding: 4px;
-  background-color: #fff;
-  border: 1px solid #ccc;
-  border: 1px solid rgba(0,0,0,.2);
-  @include box-shadow(0 1px 3px rgba(0,0,0,.1));
+// Image thumbnails
+//
+// Heads up! This is mixin-ed into thumbnails.less for `.thumbnail`.
+.img-thumbnail {
+  padding: $thumbnail-padding;
+  line-height: $line-height-base;
+  background-color: $thumbnail-bg;
+  border: 1px solid $thumbnail-border;
+  border-radius: $thumbnail-border-radius;
+  @include transition(all .2s ease-in-out);
+
+  // Keep them at most 100% wide
+  @include img-responsive(inline-block);
 }
 
 // Perfect circle
 .img-circle {
-  @include border-radius(500px); // crank the border-radius so it works with most reasonably sized images
+  border-radius: 50%; // set radius in percents
+}
+
+
+// Horizontal rules
+
+hr {
+  margin-top:    $line-height-computed;
+  margin-bottom: $line-height-computed;
+  border: 0;
+  border-top: 1px solid $hr-border;
+}
+
+
+// Only display content to screen readers
+//
+// See: http://a11yproject.com/posts/how-to-hide-content/
+
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  margin: -1px;
+  padding: 0;
+  overflow: hidden;
+  clip: rect(0,0,0,0);
+  border: 0;
+}
+
+// Use in conjunction with .sr-only to only display content when it's focused.
+// Useful for "Skip to main content" links; see http://www.w3.org/TR/2013/NOTE-WCAG20-TECHS-20130905/G1
+// Credit: HTML5 Boilerplate
+
+.sr-only-focusable {
+  &:active,
+  &:focus {
+    position: static;
+    width: auto;
+    height: auto;
+    margin: 0;
+    overflow: visible;
+    clip: auto;
+  }
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_sprites.scss b/app/assets/stylesheets/rails_admin/bootstrap/_sprites.scss
deleted file mode 100755
index a64472dcb5..0000000000
--- a/app/assets/stylesheets/rails_admin/bootstrap/_sprites.scss
+++ /dev/null
@@ -1,197 +0,0 @@
-//
-// Sprites
-// --------------------------------------------------
-
-
-// ICONS
-// -----
-
-// All icons receive the styles of the <i> tag with a base class
-// of .i and are then given a unique class to add width, height,
-// and background-position. Your resulting HTML will look like
-// <i class="icon-inbox"></i>.
-
-// For the white version of the icons, just add the .icon-white class:
-// <i class="icon-inbox icon-white"></i>
-
-[class^="icon-"],
-[class*=" icon-"] {
-  display: inline-block;
-  width: 14px;
-  height: 14px;
-  @include ie7-restore-right-whitespace();
-  line-height: 14px;
-  vertical-align: text-top;
-  background-image: url($iconSpritePath);
-  background-position: 14px 14px;
-  background-repeat: no-repeat;
-  margin-top: 1px;
-}
-
-/* White icons with optional class, or on hover/focus/active states of certain elements */
-.icon-white,
-.nav-pills > .active > a > [class^="icon-"],
-.nav-pills > .active > a > [class*=" icon-"],
-.nav-list > .active > a > [class^="icon-"],
-.nav-list > .active > a > [class*=" icon-"],
-.navbar-inverse .nav > .active > a > [class^="icon-"],
-.navbar-inverse .nav > .active > a > [class*=" icon-"],
-.dropdown-menu > li > a:hover > [class^="icon-"],
-.dropdown-menu > li > a:focus > [class^="icon-"],
-.dropdown-menu > li > a:hover > [class*=" icon-"],
-.dropdown-menu > li > a:focus > [class*=" icon-"],
-.dropdown-menu > .active > a > [class^="icon-"],
-.dropdown-menu > .active > a > [class*=" icon-"],
-.dropdown-submenu:hover > a > [class^="icon-"],
-.dropdown-submenu:focus > a > [class^="icon-"],
-.dropdown-submenu:hover > a > [class*=" icon-"],
-.dropdown-submenu:focus > a > [class*=" icon-"] {
-  background-image: url($iconWhiteSpritePath);
-}
-
-.icon-glass              { background-position: 0      0; }
-.icon-music              { background-position: -24px  0; }
-.icon-search             { background-position: -48px  0; }
-.icon-envelope           { background-position: -72px  0; }
-.icon-heart              { background-position: -96px  0; }
-.icon-star               { background-position: -120px 0; }
-.icon-star-empty         { background-position: -144px 0; }
-.icon-user               { background-position: -168px 0; }
-.icon-film               { background-position: -192px 0; }
-.icon-th-large           { background-position: -216px 0; }
-.icon-th                 { background-position: -240px 0; }
-.icon-th-list            { background-position: -264px 0; }
-.icon-ok                 { background-position: -288px 0; }
-.icon-remove             { background-position: -312px 0; }
-.icon-zoom-in            { background-position: -336px 0; }
-.icon-zoom-out           { background-position: -360px 0; }
-.icon-off                { background-position: -384px 0; }
-.icon-signal             { background-position: -408px 0; }
-.icon-cog                { background-position: -432px 0; }
-.icon-trash              { background-position: -456px 0; }
-
-.icon-home               { background-position: 0      -24px; }
-.icon-file               { background-position: -24px  -24px; }
-.icon-time               { background-position: -48px  -24px; }
-.icon-road               { background-position: -72px  -24px; }
-.icon-download-alt       { background-position: -96px  -24px; }
-.icon-download           { background-position: -120px -24px; }
-.icon-upload             { background-position: -144px -24px; }
-.icon-inbox              { background-position: -168px -24px; }
-.icon-play-circle        { background-position: -192px -24px; }
-.icon-repeat             { background-position: -216px -24px; }
-.icon-refresh            { background-position: -240px -24px; }
-.icon-list-alt           { background-position: -264px -24px; }
-.icon-lock               { background-position: -287px -24px; } // 1px off
-.icon-flag               { background-position: -312px -24px; }
-.icon-headphones         { background-position: -336px -24px; }
-.icon-volume-off         { background-position: -360px -24px; }
-.icon-volume-down        { background-position: -384px -24px; }
-.icon-volume-up          { background-position: -408px -24px; }
-.icon-qrcode             { background-position: -432px -24px; }
-.icon-barcode            { background-position: -456px -24px; }
-
-.icon-tag                { background-position: 0      -48px; }
-.icon-tags               { background-position: -25px  -48px; } // 1px off
-.icon-book               { background-position: -48px  -48px; }
-.icon-bookmark           { background-position: -72px  -48px; }
-.icon-print              { background-position: -96px  -48px; }
-.icon-camera             { background-position: -120px -48px; }
-.icon-font               { background-position: -144px -48px; }
-.icon-bold               { background-position: -167px -48px; } // 1px off
-.icon-italic             { background-position: -192px -48px; }
-.icon-text-height        { background-position: -216px -48px; }
-.icon-text-width         { background-position: -240px -48px; }
-.icon-align-left         { background-position: -264px -48px; }
-.icon-align-center       { background-position: -288px -48px; }
-.icon-align-right        { background-position: -312px -48px; }
-.icon-align-justify      { background-position: -336px -48px; }
-.icon-list               { background-position: -360px -48px; }
-.icon-indent-left        { background-position: -384px -48px; }
-.icon-indent-right       { background-position: -408px -48px; }
-.icon-facetime-video     { background-position: -432px -48px; }
-.icon-picture            { background-position: -456px -48px; }
-
-.icon-pencil             { background-position: 0      -72px; }
-.icon-map-marker         { background-position: -24px  -72px; }
-.icon-adjust             { background-position: -48px  -72px; }
-.icon-tint               { background-position: -72px  -72px; }
-.icon-edit               { background-position: -96px  -72px; }
-.icon-share              { background-position: -120px -72px; }
-.icon-check              { background-position: -144px -72px; }
-.icon-move               { background-position: -168px -72px; }
-.icon-step-backward      { background-position: -192px -72px; }
-.icon-fast-backward      { background-position: -216px -72px; }
-.icon-backward           { background-position: -240px -72px; }
-.icon-play               { background-position: -264px -72px; }
-.icon-pause              { background-position: -288px -72px; }
-.icon-stop               { background-position: -312px -72px; }
-.icon-forward            { background-position: -336px -72px; }
-.icon-fast-forward       { background-position: -360px -72px; }
-.icon-step-forward       { background-position: -384px -72px; }
-.icon-eject              { background-position: -408px -72px; }
-.icon-chevron-left       { background-position: -432px -72px; }
-.icon-chevron-right      { background-position: -456px -72px; }
-
-.icon-plus-sign          { background-position: 0      -96px; }
-.icon-minus-sign         { background-position: -24px  -96px; }
-.icon-remove-sign        { background-position: -48px  -96px; }
-.icon-ok-sign            { background-position: -72px  -96px; }
-.icon-question-sign      { background-position: -96px  -96px; }
-.icon-info-sign          { background-position: -120px -96px; }
-.icon-screenshot         { background-position: -144px -96px; }
-.icon-remove-circle      { background-position: -168px -96px; }
-.icon-ok-circle          { background-position: -192px -96px; }
-.icon-ban-circle         { background-position: -216px -96px; }
-.icon-arrow-left         { background-position: -240px -96px; }
-.icon-arrow-right        { background-position: -264px -96px; }
-.icon-arrow-up           { background-position: -289px -96px; } // 1px off
-.icon-arrow-down         { background-position: -312px -96px; }
-.icon-share-alt          { background-position: -336px -96px; }
-.icon-resize-full        { background-position: -360px -96px; }
-.icon-resize-small       { background-position: -384px -96px; }
-.icon-plus               { background-position: -408px -96px; }
-.icon-minus              { background-position: -433px -96px; }
-.icon-asterisk           { background-position: -456px -96px; }
-
-.icon-exclamation-sign   { background-position: 0      -120px; }
-.icon-gift               { background-position: -24px  -120px; }
-.icon-leaf               { background-position: -48px  -120px; }
-.icon-fire               { background-position: -72px  -120px; }
-.icon-eye-open           { background-position: -96px  -120px; }
-.icon-eye-close          { background-position: -120px -120px; }
-.icon-warning-sign       { background-position: -144px -120px; }
-.icon-plane              { background-position: -168px -120px; }
-.icon-calendar           { background-position: -192px -120px; }
-.icon-random             { background-position: -216px -120px; width: 16px; }
-.icon-comment            { background-position: -240px -120px; }
-.icon-magnet             { background-position: -264px -120px; }
-.icon-chevron-up         { background-position: -288px -120px; }
-.icon-chevron-down       { background-position: -313px -119px; } // 1px, 1px off
-.icon-retweet            { background-position: -336px -120px; }
-.icon-shopping-cart      { background-position: -360px -120px; }
-.icon-folder-close       { background-position: -384px -120px; width: 16px; }
-.icon-folder-open        { background-position: -408px -120px; width: 16px; }
-.icon-resize-vertical    { background-position: -432px -119px; } // 1px, 1px off
-.icon-resize-horizontal  { background-position: -456px -118px; } // 1px, 2px off
-
-.icon-hdd                     { background-position: 0      -144px; }
-.icon-bullhorn                { background-position: -24px  -144px; }
-.icon-bell                    { background-position: -48px  -144px; }
-.icon-certificate             { background-position: -72px  -144px; }
-.icon-thumbs-up               { background-position: -96px  -144px; }
-.icon-thumbs-down             { background-position: -120px -144px; }
-.icon-hand-right              { background-position: -144px -144px; }
-.icon-hand-left               { background-position: -168px -144px; }
-.icon-hand-up                 { background-position: -192px -144px; }
-.icon-hand-down               { background-position: -216px -144px; }
-.icon-circle-arrow-right      { background-position: -240px -144px; }
-.icon-circle-arrow-left       { background-position: -264px -144px; }
-.icon-circle-arrow-up         { background-position: -288px -144px; }
-.icon-circle-arrow-down       { background-position: -312px -144px; }
-.icon-globe                   { background-position: -336px -144px; }
-.icon-wrench                  { background-position: -360px -144px; }
-.icon-tasks                   { background-position: -384px -144px; }
-.icon-filter                  { background-position: -408px -144px; }
-.icon-briefcase               { background-position: -432px -144px; }
-.icon-fullscreen              { background-position: -456px -144px; }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_tables.scss b/app/assets/stylesheets/rails_admin/bootstrap/_tables.scss
old mode 100755
new mode 100644
index 3db661e93e..7c5d5bbf54
--- a/app/assets/stylesheets/rails_admin/bootstrap/_tables.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_tables.scss
@@ -3,233 +3,231 @@
 // --------------------------------------------------
 
 
-// BASE TABLES
-// -----------------
-
 table {
-  max-width: 100%;
-  background-color: $tableBackground;
-  border-collapse: collapse;
-  border-spacing: 0;
+  background-color: $table-bg;
 }
+th {
+  text-align: left;
+}
+
 
-// BASELINE STYLES
-// ---------------
+// Baseline styles
 
 .table {
   width: 100%;
-  margin-bottom: $baseLineHeight;
+  max-width: 100%;
+  margin-bottom: $line-height-computed;
   // Cells
-  th,
-  td {
-    padding: 8px;
-    line-height: $baseLineHeight;
-    text-align: left;
-    vertical-align: top;
-    border-top: 1px solid $tableBorder;
-  }
-  th {
-    font-weight: bold;
+  > thead,
+  > tbody,
+  > tfoot {
+    > tr {
+      > th,
+      > td {
+        padding: $table-cell-padding;
+        line-height: $line-height-base;
+        vertical-align: top;
+        border-top: 1px solid $table-border-color;
+      }
+    }
   }
   // Bottom align for column headings
-  thead th {
+  > thead > tr > th {
     vertical-align: bottom;
+    border-bottom: 2px solid $table-border-color;
   }
   // Remove top border from thead by default
-  caption + thead tr:first-child th,
-  caption + thead tr:first-child td,
-  colgroup + thead tr:first-child th,
-  colgroup + thead tr:first-child td,
-  thead:first-child tr:first-child th,
-  thead:first-child tr:first-child td {
-    border-top: 0;
+  > caption + thead,
+  > colgroup + thead,
+  > thead:first-child {
+    > tr:first-child {
+      > th,
+      > td {
+        border-top: 0;
+      }
+    }
   }
   // Account for multiple tbody instances
-  tbody + tbody {
-    border-top: 2px solid $tableBorder;
+  > tbody + tbody {
+    border-top: 2px solid $table-border-color;
   }
 
   // Nesting
   .table {
-    background-color: $bodyBackground;
+    background-color: $body-bg;
   }
 }
 
 
-
-// CONDENSED TABLE W/ HALF PADDING
-// -------------------------------
+// Condensed table w/ half padding
 
 .table-condensed {
-  th,
-  td {
-    padding: 4px 5px;
+  > thead,
+  > tbody,
+  > tfoot {
+    > tr {
+      > th,
+      > td {
+        padding: $table-condensed-cell-padding;
+      }
+    }
   }
 }
 
 
-// BORDERED VERSION
-// ----------------
+// Bordered version
+//
+// Add borders all around the table and between all the columns.
 
 .table-bordered {
-  border: 1px solid $tableBorder;
-  border-collapse: separate; // Done so we can round those corners!
-  *border-collapse: collapse; // IE7 can't round corners anyway
-  border-left: 0;
-  @include border-radius($baseBorderRadius);
-  th,
-  td {
-    border-left: 1px solid $tableBorder;
-  }
-  // Prevent a double border
-  caption + thead tr:first-child th,
-  caption + tbody tr:first-child th,
-  caption + tbody tr:first-child td,
-  colgroup + thead tr:first-child th,
-  colgroup + tbody tr:first-child th,
-  colgroup + tbody tr:first-child td,
-  thead:first-child tr:first-child th,
-  tbody:first-child tr:first-child th,
-  tbody:first-child tr:first-child td {
-    border-top: 0;
-  }
-  // For first th/td in the first row in the first thead or tbody
-  thead:first-child tr:first-child > th:first-child,
-  tbody:first-child tr:first-child > td:first-child,
-  tbody:first-child tr:first-child > th:first-child {
-    @include border-top-left-radius($baseBorderRadius);
-  }
-  // For last th/td in the first row in the first thead or tbody
-  thead:first-child tr:first-child > th:last-child,
-  tbody:first-child tr:first-child > td:last-child,
-  tbody:first-child tr:first-child > th:last-child {
-    @include border-top-right-radius($baseBorderRadius);
-  }
-  // For first th/td (can be either) in the last row in the last thead, tbody, and tfoot
-  thead:last-child tr:last-child > th:first-child,
-  tbody:last-child tr:last-child > td:first-child,
-  tbody:last-child tr:last-child > th:first-child,
-  tfoot:last-child tr:last-child > td:first-child,
-  tfoot:last-child tr:last-child > th:first-child {
-    @include border-bottom-left-radius($baseBorderRadius);
-  }
-  // For last th/td (can be either) in the last row in the last thead, tbody, and tfoot
-  thead:last-child tr:last-child > th:last-child,
-  tbody:last-child tr:last-child > td:last-child,
-  tbody:last-child tr:last-child > th:last-child,
-  tfoot:last-child tr:last-child > td:last-child,
-  tfoot:last-child tr:last-child > th:last-child {
-    @include border-bottom-right-radius($baseBorderRadius);
-  }
-
-  // Clear border-radius for first and last td in the last row in the last tbody for table with tfoot
-  tfoot + tbody:last-child tr:last-child td:first-child {
-    @include border-bottom-left-radius(0);
-  }
-  tfoot + tbody:last-child tr:last-child td:last-child {
-    @include border-bottom-right-radius(0);
-  }
-
-  // Special fixes to round the left border on the first td/th
-  caption + thead tr:first-child th:first-child,
-  caption + tbody tr:first-child td:first-child,
-  colgroup + thead tr:first-child th:first-child,
-  colgroup + tbody tr:first-child td:first-child {
-    @include border-top-left-radius($baseBorderRadius);
+  border: 1px solid $table-border-color;
+  > thead,
+  > tbody,
+  > tfoot {
+    > tr {
+      > th,
+      > td {
+        border: 1px solid $table-border-color;
+      }
+    }
   }
-  caption + thead tr:first-child th:last-child,
-  caption + tbody tr:first-child td:last-child,
-  colgroup + thead tr:first-child th:last-child,
-  colgroup + tbody tr:first-child td:last-child {
-    @include border-top-right-radius($baseBorderRadius);
+  > thead > tr {
+    > th,
+    > td {
+      border-bottom-width: 2px;
+    }
   }
-
 }
 
 
-
-
-// ZEBRA-STRIPING
-// --------------
-
+// Zebra-striping
+//
 // Default zebra-stripe styles (alternating gray and transparent backgrounds)
+
 .table-striped {
-  tbody {
-    > tr:nth-child(odd) > td,
-    > tr:nth-child(odd) > th {
-      background-color: $tableBackgroundAccent;
+  > tbody > tr:nth-child(odd) {
+    > td,
+    > th {
+      background-color: $table-bg-accent;
     }
   }
 }
 
 
-// HOVER EFFECT
-// ------------
+// Hover effect
+//
 // Placed here since it has to come after the potential zebra striping
+
 .table-hover {
-  tbody {
-    tr:hover > td,
-    tr:hover > th {
-      background-color: $tableBackgroundHover;
+  > tbody > tr:hover {
+    > td,
+    > th {
+      background-color: $table-bg-hover;
     }
   }
 }
 
 
-// TABLE CELL SIZING
-// -----------------
+// Table cell sizing
+//
+// Reset default table behavior
 
-// Reset default grid behavior
-table td[class*="span"],
-table th[class*="span"],
-.row-fluid table td[class*="span"],
-.row-fluid table th[class*="span"] {
-  display: table-cell;
-  float: none; // undo default grid column styles
-  margin-left: 0; // undo default grid column styles
+table col[class*="col-"] {
+  position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
+  float: none;
+  display: table-column;
 }
-
-// Change the column widths to account for td/th padding
-.table td,
-.table th {
-  @for $i from 1 through 12 {
-    &.span#{$i} { @include tableColumns($i); }
+table {
+  td,
+  th {
+    &[class*="col-"] {
+      position: static; // Prevent border hiding in Firefox and IE9/10 (see https://github.com/twbs/bootstrap/issues/11623)
+      float: none;
+      display: table-cell;
+    }
   }
 }
 
 
+// Table backgrounds
+//
+// Exact selectors below required to override `.table-striped` and prevent
+// inheritance to nested tables.
 
-// TABLE BACKGROUNDS
-// -----------------
-// Exact selectors below required to override .table-striped
+// Generate the contextual variants
+@include table-row-variant('active', $table-bg-active);
+@include table-row-variant('success', $state-success-bg);
+@include table-row-variant('info', $state-info-bg);
+@include table-row-variant('warning', $state-warning-bg);
+@include table-row-variant('danger', $state-danger-bg);
 
-.table tbody tr {
-  &.success > td {
-    background-color: $successBackground;
-  }
-  &.error > td {
-    background-color: $errorBackground;
-  }
-  &.warning > td {
-    background-color: $warningBackground;
-  }
-  &.info > td {
-    background-color: $infoBackground;
-  }
-}
 
-// Hover states for .table-hover
-.table-hover tbody tr {
-  &.success:hover > td {
-    background-color: darken($successBackground, 5%);
-  }
-  &.error:hover > td {
-    background-color: darken($errorBackground, 5%);
-  }
-  &.warning:hover > td {
-    background-color: darken($warningBackground, 5%);
-  }
-  &.info:hover > td {
-    background-color: darken($infoBackground, 5%);
+// Responsive tables
+//
+// Wrap your tables in `.table-responsive` and we'll make them mobile friendly
+// by enabling horizontal scrolling. Only applies <768px. Everything above that
+// will display normally.
+
+.table-responsive {
+  @media screen and (max-width: $screen-xs-max) {
+    width: 100%;
+    margin-bottom: ($line-height-computed * 0.75);
+    overflow-y: hidden;
+    overflow-x: auto;
+    -ms-overflow-style: -ms-autohiding-scrollbar;
+    border: 1px solid $table-border-color;
+    -webkit-overflow-scrolling: touch;
+
+    // Tighten up spacing
+    > .table {
+      margin-bottom: 0;
+
+      // Ensure the content doesn't wrap
+      > thead,
+      > tbody,
+      > tfoot {
+        > tr {
+          > th,
+          > td {
+            white-space: nowrap;
+          }
+        }
+      }
+    }
+
+    // Special overrides for the bordered tables
+    > .table-bordered {
+      border: 0;
+
+      // Nuke the appropriate borders so that the parent can handle them
+      > thead,
+      > tbody,
+      > tfoot {
+        > tr {
+          > th:first-child,
+          > td:first-child {
+            border-left: 0;
+          }
+          > th:last-child,
+          > td:last-child {
+            border-right: 0;
+          }
+        }
+      }
+
+      // Only nuke the last row's bottom-border in `tbody` and `tfoot` since
+      // chances are there will be only one `tr` in a `thead` and that would
+      // remove the border altogether.
+      > tbody,
+      > tfoot {
+        > tr:last-child {
+          > th,
+          > td {
+            border-bottom: 0;
+          }
+        }
+      }
+
+    }
   }
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_theme.scss b/app/assets/stylesheets/rails_admin/bootstrap/_theme.scss
new file mode 100644
index 0000000000..00386a2881
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_theme.scss
@@ -0,0 +1,258 @@
+
+//
+// Load core variables and mixins
+// --------------------------------------------------
+
+@import "variables";
+@import "mixins";
+
+
+
+//
+// Buttons
+// --------------------------------------------------
+
+// Common styles
+.btn-default,
+.btn-primary,
+.btn-success,
+.btn-info,
+.btn-warning,
+.btn-danger {
+  text-shadow: 0 -1px 0 rgba(0,0,0,.2);
+  $shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.075);
+  @include box-shadow($shadow);
+
+  // Reset the shadow
+  &:active,
+  &.active {
+    @include box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
+  }
+}
+
+// Mixin for generating new styles
+@mixin btn-styles($btn-color: #555) {
+  @include gradient-vertical($start-color: $btn-color, $end-color: darken($btn-color, 12%));
+  @include reset-filter(); // Disable gradients for IE9 because filter bleeds through rounded corners
+  background-repeat: repeat-x;
+  border-color: darken($btn-color, 14%);
+
+  &:hover,
+  &:focus  {
+    background-color: darken($btn-color, 12%);
+    background-position: 0 -15px;
+  }
+
+  &:active,
+  &.active {
+    background-color: darken($btn-color, 12%);
+    border-color: darken($btn-color, 14%);
+  }
+
+  &:disabled,
+  &[disabled] {
+    background-color: darken($btn-color, 12%);
+    background-image: none;
+  }
+}
+
+// Common styles
+.btn {
+  // Remove the gradient for the pressed/active state
+  &:active,
+  &.active {
+    background-image: none;
+  }
+}
+
+// Apply the mixin to the buttons
+.btn-default { @include btn-styles($btn-default-bg); text-shadow: 0 1px 0 #fff; border-color: #ccc; }
+.btn-primary { @include btn-styles($btn-primary-bg); }
+.btn-success { @include btn-styles($btn-success-bg); }
+.btn-info    { @include btn-styles($btn-info-bg); }
+.btn-warning { @include btn-styles($btn-warning-bg); }
+.btn-danger  { @include btn-styles($btn-danger-bg); }
+
+
+
+//
+// Images
+// --------------------------------------------------
+
+.thumbnail,
+.img-thumbnail {
+  @include box-shadow(0 1px 2px rgba(0,0,0,.075));
+}
+
+
+
+//
+// Dropdowns
+// --------------------------------------------------
+
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus {
+  @include gradient-vertical($start-color: $dropdown-link-hover-bg, $end-color: darken($dropdown-link-hover-bg, 5%));
+  background-color: darken($dropdown-link-hover-bg, 5%);
+}
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  @include gradient-vertical($start-color: $dropdown-link-active-bg, $end-color: darken($dropdown-link-active-bg, 5%));
+  background-color: darken($dropdown-link-active-bg, 5%);
+}
+
+
+
+//
+// Navbar
+// --------------------------------------------------
+
+// Default navbar
+.navbar-default {
+  @include gradient-vertical($start-color: lighten($navbar-default-bg, 10%), $end-color: $navbar-default-bg);
+  @include reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
+  border-radius: $navbar-border-radius;
+  $shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075);
+  @include box-shadow($shadow);
+
+  .navbar-nav > .active > a {
+    @include gradient-vertical($start-color: darken($navbar-default-bg, 5%), $end-color: darken($navbar-default-bg, 2%));
+    @include box-shadow(inset 0 3px 9px rgba(0,0,0,.075));
+  }
+}
+.navbar-brand,
+.navbar-nav > li > a {
+  text-shadow: 0 1px 0 rgba(255,255,255,.25);
+}
+
+// Inverted navbar
+.navbar-inverse {
+  @include gradient-vertical($start-color: lighten($navbar-inverse-bg, 10%), $end-color: $navbar-inverse-bg);
+  @include reset-filter(); // Remove gradient in IE<10 to fix bug where dropdowns don't get triggered
+
+  .navbar-nav > .active > a {
+    @include gradient-vertical($start-color: $navbar-inverse-bg, $end-color: lighten($navbar-inverse-bg, 2.5%));
+    @include box-shadow(inset 0 3px 9px rgba(0,0,0,.25));
+  }
+
+  .navbar-brand,
+  .navbar-nav > li > a {
+    text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+  }
+}
+
+// Undo rounded corners in static and fixed navbars
+.navbar-static-top,
+.navbar-fixed-top,
+.navbar-fixed-bottom {
+  border-radius: 0;
+}
+
+
+
+//
+// Alerts
+// --------------------------------------------------
+
+// Common styles
+.alert {
+  text-shadow: 0 1px 0 rgba(255,255,255,.2);
+  $shadow: inset 0 1px 0 rgba(255,255,255,.25), 0 1px 2px rgba(0,0,0,.05);
+  @include box-shadow($shadow);
+}
+
+// Mixin for generating new styles
+@mixin alert-styles($color) {
+  @include gradient-vertical($start-color: $color, $end-color: darken($color, 7.5%));
+  border-color: darken($color, 15%);
+}
+
+// Apply the mixin to the alerts
+.alert-success    { @include alert-styles($alert-success-bg); }
+.alert-info       { @include alert-styles($alert-info-bg); }
+.alert-warning    { @include alert-styles($alert-warning-bg); }
+.alert-danger     { @include alert-styles($alert-danger-bg); }
+
+
+
+//
+// Progress bars
+// --------------------------------------------------
+
+// Give the progress background some depth
+.progress {
+  @include gradient-vertical($start-color: darken($progress-bg, 4%), $end-color: $progress-bg)
+}
+
+// Mixin for generating new styles
+@mixin progress-bar-styles($color) {
+  @include gradient-vertical($start-color: $color, $end-color: darken($color, 10%));
+}
+
+// Apply the mixin to the progress bars
+.progress-bar            { @include progress-bar-styles($progress-bar-bg); }
+.progress-bar-success    { @include progress-bar-styles($progress-bar-success-bg); }
+.progress-bar-info       { @include progress-bar-styles($progress-bar-info-bg); }
+.progress-bar-warning    { @include progress-bar-styles($progress-bar-warning-bg); }
+.progress-bar-danger     { @include progress-bar-styles($progress-bar-danger-bg); }
+
+// Reset the striped class because our mixins don't do multiple gradients and
+// the above custom styles override the new `.progress-bar-striped` in v3.2.0.
+.progress-bar-striped {
+  @include gradient-striped();
+}
+
+
+//
+// List groups
+// --------------------------------------------------
+
+.list-group {
+  border-radius: $border-radius-base;
+  @include box-shadow(0 1px 2px rgba(0,0,0,.075));
+}
+.list-group-item.active,
+.list-group-item.active:hover,
+.list-group-item.active:focus {
+  text-shadow: 0 -1px 0 darken($list-group-active-bg, 10%);
+  @include gradient-vertical($start-color: $list-group-active-bg, $end-color: darken($list-group-active-bg, 7.5%));
+  border-color: darken($list-group-active-border, 7.5%);
+}
+
+
+
+//
+// Panels
+// --------------------------------------------------
+
+// Common styles
+.panel {
+  @include box-shadow(0 1px 2px rgba(0,0,0,.05));
+}
+
+// Mixin for generating new styles
+@mixin panel-heading-styles($color) {
+  @include gradient-vertical($start-color: $color, $end-color: darken($color, 5%));
+}
+
+// Apply the mixin to the panel headings only
+.panel-default > .panel-heading   { @include panel-heading-styles($panel-default-heading-bg); }
+.panel-primary > .panel-heading   { @include panel-heading-styles($panel-primary-heading-bg); }
+.panel-success > .panel-heading   { @include panel-heading-styles($panel-success-heading-bg); }
+.panel-info > .panel-heading      { @include panel-heading-styles($panel-info-heading-bg); }
+.panel-warning > .panel-heading   { @include panel-heading-styles($panel-warning-heading-bg); }
+.panel-danger > .panel-heading    { @include panel-heading-styles($panel-danger-heading-bg); }
+
+
+
+//
+// Wells
+// --------------------------------------------------
+
+.well {
+  @include gradient-vertical($start-color: darken($well-bg, 5%), $end-color: $well-bg);
+  border-color: darken($well-bg, 10%);
+  $shadow: inset 0 1px 3px rgba(0,0,0,.05), 0 1px 0 rgba(255,255,255,.1);
+  @include box-shadow($shadow);
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_thumbnails.scss b/app/assets/stylesheets/rails_admin/bootstrap/_thumbnails.scss
old mode 100755
new mode 100644
index 6333d5334c..3d5ed86d05
--- a/app/assets/stylesheets/rails_admin/bootstrap/_thumbnails.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_thumbnails.scss
@@ -3,51 +3,36 @@
 // --------------------------------------------------
 
 
-// Note: `.thumbnails` and `.thumbnails > li` are overriden in responsive files
-
-// Make wrapper ul behave like the grid
-.thumbnails {
-  margin-left: -$gridGutterWidth;
-  list-style: none;
-  @include clearfix();
-}
-// Fluid rows have no left margin
-.row-fluid .thumbnails {
-  margin-left: 0;
-}
-
-// Float li to make thumbnails appear in a row
-.thumbnails > li {
-  float: left; // Explicity set the float since we don't require .span* classes
-  margin-bottom: $baseLineHeight;
-  margin-left: $gridGutterWidth;
-}
-
-// The actual thumbnail (can be `a` or `div`)
+// Mixin and adjust the regular image class
 .thumbnail {
   display: block;
-  padding: 4px;
-  line-height: $baseLineHeight;
-  border: 1px solid #ddd;
-  @include border-radius($baseBorderRadius);
-  @include box-shadow(0 1px 3px rgba(0,0,0,.055));
+  padding: $thumbnail-padding;
+  margin-bottom: $line-height-computed;
+  line-height: $line-height-base;
+  background-color: $thumbnail-bg;
+  border: 1px solid $thumbnail-border;
+  border-radius: $thumbnail-border-radius;
   @include transition(all .2s ease-in-out);
-}
-// Add a hover/focus state for linked versions only
-a.thumbnail:hover,
-a.thumbnail:focus {
-  border-color: $linkColor;
-  @include box-shadow(0 1px 4px rgba(0,105,214,.25));
-}
 
-// Images and captions
-.thumbnail > img {
-  display: block;
-  max-width: 100%;
-  margin-left: auto;
-  margin-right: auto;
+  > img,
+  a > img {
+    @include img-responsive();
+    margin-left: auto;
+    margin-right: auto;
+  }
+
+  // [converter] extracted a&:hover, a&:focus, a&.active to a.thumbnail:hover, a.thumbnail:focus, a.thumbnail.active
+
+  // Image captions
+  .caption {
+    padding: $thumbnail-caption-padding;
+    color: $thumbnail-caption-color;
+  }
 }
-.thumbnail .caption {
-  padding: 9px;
-  color: $gray;
+
+// Add a hover state for linked versions only
+a.thumbnail:hover,
+a.thumbnail:focus,
+a.thumbnail.active {
+  border-color: $link-color;
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_tooltip.scss b/app/assets/stylesheets/rails_admin/bootstrap/_tooltip.scss
old mode 100755
new mode 100644
index af2d64cb02..dec674cb40
--- a/app/assets/stylesheets/rails_admin/bootstrap/_tooltip.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_tooltip.scss
@@ -6,28 +6,29 @@
 // Base class
 .tooltip {
   position: absolute;
-  z-index: $zindexTooltip;
+  z-index: $zindex-tooltip;
   display: block;
   visibility: visible;
-  font-size: 11px;
+  font-size: $font-size-small;
   line-height: 1.4;
   @include opacity(0);
-  &.in     { @include opacity(80); }
-  &.top    { margin-top:  -3px; padding: 5px 0; }
-  &.right  { margin-left:  3px; padding: 0 5px; }
-  &.bottom { margin-top:   3px; padding: 5px 0; }
-  &.left   { margin-left: -3px; padding: 0 5px; }
+
+  &.in     { @include opacity($tooltip-opacity); }
+  &.top    { margin-top:  -3px; padding: $tooltip-arrow-width 0; }
+  &.right  { margin-left:  3px; padding: 0 $tooltip-arrow-width; }
+  &.bottom { margin-top:   3px; padding: $tooltip-arrow-width 0; }
+  &.left   { margin-left: -3px; padding: 0 $tooltip-arrow-width; }
 }
 
 // Wrapper for the tooltip content
 .tooltip-inner {
-  max-width: 200px;
-  padding: 8px;
-  color: $tooltipColor;
+  max-width: $tooltip-max-width;
+  padding: 3px 8px;
+  color: $tooltip-color;
   text-align: center;
   text-decoration: none;
-  background-color: $tooltipBackground;
-  @include border-radius($baseBorderRadius);
+  background-color: $tooltip-bg;
+  border-radius: $border-radius-base;
 }
 
 // Arrows
@@ -42,29 +43,53 @@
   &.top .tooltip-arrow {
     bottom: 0;
     left: 50%;
-    margin-left: -$tooltipArrowWidth;
-    border-width: $tooltipArrowWidth $tooltipArrowWidth 0;
-    border-top-color: $tooltipArrowColor;
+    margin-left: -$tooltip-arrow-width;
+    border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
+    border-top-color: $tooltip-arrow-color;
+  }
+  &.top-left .tooltip-arrow {
+    bottom: 0;
+    left: $tooltip-arrow-width;
+    border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
+    border-top-color: $tooltip-arrow-color;
+  }
+  &.top-right .tooltip-arrow {
+    bottom: 0;
+    right: $tooltip-arrow-width;
+    border-width: $tooltip-arrow-width $tooltip-arrow-width 0;
+    border-top-color: $tooltip-arrow-color;
   }
   &.right .tooltip-arrow {
     top: 50%;
     left: 0;
-    margin-top: -$tooltipArrowWidth;
-    border-width: $tooltipArrowWidth $tooltipArrowWidth $tooltipArrowWidth 0;
-    border-right-color: $tooltipArrowColor;
+    margin-top: -$tooltip-arrow-width;
+    border-width: $tooltip-arrow-width $tooltip-arrow-width $tooltip-arrow-width 0;
+    border-right-color: $tooltip-arrow-color;
   }
   &.left .tooltip-arrow {
     top: 50%;
     right: 0;
-    margin-top: -$tooltipArrowWidth;
-    border-width: $tooltipArrowWidth 0 $tooltipArrowWidth $tooltipArrowWidth;
-    border-left-color: $tooltipArrowColor;
+    margin-top: -$tooltip-arrow-width;
+    border-width: $tooltip-arrow-width 0 $tooltip-arrow-width $tooltip-arrow-width;
+    border-left-color: $tooltip-arrow-color;
   }
   &.bottom .tooltip-arrow {
     top: 0;
     left: 50%;
-    margin-left: -$tooltipArrowWidth;
-    border-width: 0 $tooltipArrowWidth $tooltipArrowWidth;
-    border-bottom-color: $tooltipArrowColor;
+    margin-left: -$tooltip-arrow-width;
+    border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
+    border-bottom-color: $tooltip-arrow-color;
+  }
+  &.bottom-left .tooltip-arrow {
+    top: 0;
+    left: $tooltip-arrow-width;
+    border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
+    border-bottom-color: $tooltip-arrow-color;
+  }
+  &.bottom-right .tooltip-arrow {
+    top: 0;
+    right: $tooltip-arrow-width;
+    border-width: 0 $tooltip-arrow-width $tooltip-arrow-width;
+    border-bottom-color: $tooltip-arrow-color;
   }
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_type.scss b/app/assets/stylesheets/rails_admin/bootstrap/_type.scss
old mode 100755
new mode 100644
index f68e7ba2d0..3f21b21085
--- a/app/assets/stylesheets/rails_admin/bootstrap/_type.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_type.scss
@@ -3,134 +3,179 @@
 // --------------------------------------------------
 
 
+// Headings
+// -------------------------
+
+h1, h2, h3, h4, h5, h6,
+.h1, .h2, .h3, .h4, .h5, .h6 {
+  font-family: $headings-font-family;
+  font-weight: $headings-font-weight;
+  line-height: $headings-line-height;
+  color: $headings-color;
+
+  small,
+  .small {
+    font-weight: normal;
+    line-height: 1;
+    color: $headings-small-color;
+  }
+}
+
+h1, .h1,
+h2, .h2,
+h3, .h3 {
+  margin-top: $line-height-computed;
+  margin-bottom: ($line-height-computed / 2);
+
+  small,
+  .small {
+    font-size: 65%;
+  }
+}
+h4, .h4,
+h5, .h5,
+h6, .h6 {
+  margin-top: ($line-height-computed / 2);
+  margin-bottom: ($line-height-computed / 2);
+
+  small,
+  .small {
+    font-size: 75%;
+  }
+}
+
+h1, .h1 { font-size: $font-size-h1; }
+h2, .h2 { font-size: $font-size-h2; }
+h3, .h3 { font-size: $font-size-h3; }
+h4, .h4 { font-size: $font-size-h4; }
+h5, .h5 { font-size: $font-size-h5; }
+h6, .h6 { font-size: $font-size-h6; }
+
+
 // Body text
 // -------------------------
 
 p {
-  margin: 0 0 $baseLineHeight / 2;
+  margin: 0 0 ($line-height-computed / 2);
 }
+
 .lead {
-  margin-bottom: $baseLineHeight;
-  font-size: $baseFontSize * 1.5;
-  font-weight: 200;
-  line-height: $baseLineHeight * 1.5;
+  margin-bottom: $line-height-computed;
+  font-size: floor(($font-size-base * 1.15));
+  font-weight: 300;
+  line-height: 1.4;
+
+  @media (min-width: $screen-sm-min) {
+    font-size: ($font-size-base * 1.5);
+  }
 }
 
 
 // Emphasis & misc
 // -------------------------
 
-// Ex: 14px base font * 85% = about 12px
-small   { font-size: 85%; }
+// Ex: (12px small font / 14px base font) * 100% = about 85%
+small,
+.small {
+  font-size: floor((100% * $font-size-small / $font-size-base));
+}
 
-strong  { font-weight: bold; }
-em      { font-style: italic; }
-cite    { font-style: normal; }
+// Undo browser default styling
+cite {
+  font-style: normal;
+}
 
-// Utility classes
-.muted               { color: $grayLight; }
-a.muted:hover,
-a.muted:focus        { color: darken($grayLight, 10%); }
+mark,
+.mark {
+  background-color: $state-warning-bg;
+  padding: .2em;
+}
 
-.text-warning        { color: $warningText; }
-a.text-warning:hover,
-a.text-warning:focus { color: darken($warningText, 10%); }
+// Alignment
+.text-left           { text-align: left; }
+.text-right          { text-align: right; }
+.text-center         { text-align: center; }
+.text-justify        { text-align: justify; }
+.text-nowrap         { white-space: nowrap; }
 
-.text-error          { color: $errorText; }
-a.text-error:hover,
-a.text-error:focus   { color: darken($errorText, 10%); }
+// Transformation
+.text-lowercase      { text-transform: lowercase; }
+.text-uppercase      { text-transform: uppercase; }
+.text-capitalize     { text-transform: capitalize; }
 
-.text-info           { color: $infoText; }
-a.text-info:hover,
-a.text-info:focus    { color: darken($infoText, 10%); }
+// Contextual colors
+.text-muted {
+  color: $text-muted;
+}
 
-.text-success        { color: $successText; }
-a.text-success:hover,
-a.text-success:focus { color: darken($successText, 10%); }
+@include text-emphasis-variant('.text-primary', $brand-primary);
 
-.text-left           { text-align: left; }
-.text-right          { text-align: right; }
-.text-center         { text-align: center; }
+@include text-emphasis-variant('.text-success', $state-success-text);
 
+@include text-emphasis-variant('.text-info', $state-info-text);
 
-// Headings
-// -------------------------
+@include text-emphasis-variant('.text-warning', $state-warning-text);
 
-h1, h2, h3, h4, h5, h6 {
-  margin: ($baseLineHeight / 2) 0;
-  font-family: $headingsFontFamily;
-  font-weight: $headingsFontWeight;
-  line-height: $baseLineHeight;
-  color: $headingsColor;
-  text-rendering: optimizelegibility; // Fix the character spacing for headings
-  small {
-    font-weight: normal;
-    line-height: 1;
-    color: $grayLight;
-  }
+@include text-emphasis-variant('.text-danger', $state-danger-text);
+
+// Contextual backgrounds
+// For now we'll leave these alongside the text classes until v4 when we can
+// safely shift things around (per SemVer rules).
+.bg-primary {
+  // Given the contrast here, this is the only class to have its color inverted
+  // automatically.
+  color: #fff;
 }
+@include bg-variant('.bg-primary', $brand-primary);
 
-h1,
-h2,
-h3 { line-height: $baseLineHeight * 2; }
+@include bg-variant('.bg-success', $state-success-bg);
 
-h1 { font-size: $baseFontSize * 2.75; } // ~38px
-h2 { font-size: $baseFontSize * 2.25; } // ~32px
-h3 { font-size: $baseFontSize * 1.75; } // ~24px
-h4 { font-size: $baseFontSize * 1.25; } // ~18px
-h5 { font-size: $baseFontSize; }
-h6 { font-size: $baseFontSize * 0.85; } // ~12px
+@include bg-variant('.bg-info', $state-info-bg);
 
-h1 small { font-size: $baseFontSize * 1.75; } // ~24px
-h2 small { font-size: $baseFontSize * 1.25; } // ~18px
-h3 small { font-size: $baseFontSize; }
-h4 small { font-size: $baseFontSize; }
+@include bg-variant('.bg-warning', $state-warning-bg);
+
+@include bg-variant('.bg-danger', $state-danger-bg);
 
 
 // Page header
 // -------------------------
 
 .page-header {
-  padding-bottom: ($baseLineHeight / 2) - 1;
-  margin: $baseLineHeight 0 ($baseLineHeight * 1.5);
-  border-bottom: 1px solid $grayLighter;
+  padding-bottom: (($line-height-computed / 2) - 1);
+  margin: ($line-height-computed * 2) 0 $line-height-computed;
+  border-bottom: 1px solid $page-header-border-color;
 }
 
 
-
 // Lists
-// --------------------------------------------------
+// -------------------------
 
 // Unordered and Ordered lists
-ul, ol {
-  padding: 0;
-  margin: 0 0 $baseLineHeight / 2 25px;
-}
-ul ul,
-ul ol,
-ol ol,
-ol ul {
-  margin-bottom: 0;
-}
-li {
-  line-height: $baseLineHeight;
+ul,
+ol {
+  margin-top: 0;
+  margin-bottom: ($line-height-computed / 2);
+  ul,
+  ol {
+    margin-bottom: 0;
+  }
 }
 
-// Remove default list styles
-ul.unstyled,
-ol.unstyled {
-  margin-left: 0;
+// List options
+
+// Unstyled keeps list items block level, just removes default browser padding and list-style
+.list-unstyled {
+  padding-left: 0;
   list-style: none;
 }
 
-// Single-line list items
-ul.inline,
-ol.inline {
-  margin-left: 0;
-  list-style: none;
+// Inline turns list items into inline-block
+.list-inline {
+  @extend .list-unstyled;
+  margin-left: -5px;
+
   > li {
     display: inline-block;
-    @include ie7-inline-block();
     padding-left: 5px;
     padding-right: 5px;
   }
@@ -138,101 +183,114 @@ ol.inline {
 
 // Description Lists
 dl {
-  margin-bottom: $baseLineHeight;
+  margin-top: 0; // Remove browser default
+  margin-bottom: $line-height-computed;
 }
 dt,
 dd {
-  line-height: $baseLineHeight;
+  line-height: $line-height-base;
 }
 dt {
   font-weight: bold;
 }
 dd {
-  margin-left: $baseLineHeight / 2;
+  margin-left: 0; // Undo browser default
 }
-// Horizontal layout (like forms)
+
+// Horizontal description lists
+//
+// Defaults to being stacked without any of the below styles applied, until the
+// grid breakpoint is reached (default of ~768px).
+
 .dl-horizontal {
-  @include clearfix(); // Ensure dl clears floats if empty dd elements present
-  dt {
-    float: left;
-    width: $horizontalComponentOffset - 20;
-    clear: left;
-    text-align: right;
-    @include text-overflow();
-  }
   dd {
-    margin-left: $horizontalComponentOffset;
+    @include clearfix(); // Clear the floated `dt` if an empty `dd` is present
+  }
+
+  @media (min-width: $grid-float-breakpoint) {
+    dt {
+      float: left;
+      width: ($dl-horizontal-offset - 20);
+      clear: left;
+      text-align: right;
+      @include text-overflow();
+    }
+    dd {
+      margin-left: $dl-horizontal-offset;
+    }
   }
 }
 
-// MISC
-// ----
 
-// Horizontal rules
-hr {
-  margin: $baseLineHeight 0;
-  border: 0;
-  border-top: 1px solid $hrBorder;
-  border-bottom: 1px solid $white;
-}
+// Misc
+// -------------------------
 
 // Abbreviations and acronyms
 abbr[title],
-// Added data-* attribute to help out our tooltip plugin, per https://github.com/twitter/bootstrap/issues/5257
+// Add data-* attribute to help out our tooltip plugin, per https://github.com/twbs/bootstrap/issues/5257
 abbr[data-original-title] {
   cursor: help;
-  border-bottom: 1px dotted $grayLight;
+  border-bottom: 1px dotted $abbr-border-color;
 }
-abbr.initialism {
+.initialism {
   font-size: 90%;
   text-transform: uppercase;
 }
 
 // Blockquotes
 blockquote {
-  padding: 0 0 0 15px;
-  margin: 0 0 $baseLineHeight;
-  border-left: 5px solid $grayLighter;
-  p {
-    margin-bottom: 0;
-    font-size: $baseFontSize * 1.25;
-    font-weight: 300;
-    line-height: 1.25;
+  padding: ($line-height-computed / 2) $line-height-computed;
+  margin: 0 0 $line-height-computed;
+  font-size: $blockquote-font-size;
+  border-left: 5px solid $blockquote-border-color;
+
+  p,
+  ul,
+  ol {
+    &:last-child {
+      margin-bottom: 0;
+    }
   }
-  small {
+
+  // Note: Deprecated small and .small as of v3.1.0
+  // Context: https://github.com/twbs/bootstrap/issues/11660
+  footer,
+  small,
+  .small {
     display: block;
-    line-height: $baseLineHeight;
-    color: $grayLight;
+    font-size: 80%; // back to default font-size
+    line-height: $line-height-base;
+    color: $blockquote-small-color;
+
     &:before {
-      content: '\2014 \00A0';
+      content: '\2014 \00A0'; // em dash, nbsp
     }
   }
+}
 
-  // Float right with text-align: right
-  &.pull-right {
-    float: right;
-    padding-right: 15px;
-    padding-left: 0;
-    border-right: 5px solid $grayLighter;
-    border-left: 0;
-    p,
-    small {
-      text-align: right;
-    }
-    small {
-      &:before {
-        content: '';
-      }
-      &:after {
-        content: '\00A0 \2014';
-      }
+// Opposite alignment of blockquote
+//
+// Heads up: `blockquote.pull-right` has been deprecated as of v3.1.0.
+.blockquote-reverse,
+blockquote.pull-right {
+  padding-right: 15px;
+  padding-left: 0;
+  border-right: 5px solid $blockquote-border-color;
+  border-left: 0;
+  text-align: right;
+
+  // Account for citation
+  footer,
+  small,
+  .small {
+    &:before { content: ''; }
+    &:after {
+      content: '\00A0 \2014'; // nbsp, em dash
     }
   }
 }
 
 // Quotes
-q:before,
-q:after,
 blockquote:before,
 blockquote:after {
   content: "";
@@ -240,8 +298,7 @@ blockquote:after {
 
 // Addresses
 address {
-  display: block;
-  margin-bottom: $baseLineHeight;
+  margin-bottom: $line-height-computed;
   font-style: normal;
-  line-height: $baseLineHeight;
+  line-height: $line-height-base;
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_utilities.scss b/app/assets/stylesheets/rails_admin/bootstrap/_utilities.scss
old mode 100755
new mode 100644
index 1dec18b602..3ad5f2eed5
--- a/app/assets/stylesheets/rails_admin/bootstrap/_utilities.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_utilities.scss
@@ -3,43 +3,55 @@
 // --------------------------------------------------
 
 
-// Quick floats
+// Floats
+// -------------------------
+
+.clearfix {
+  @include clearfix();
+}
+.center-block {
+  @include center-block();
+}
 .pull-right {
-  float: right;
+  float: right !important;
 }
 .pull-left {
-  float: left;
+  float: left !important;
 }
 
+
 // Toggling content
+// -------------------------
+
+// Note: Deprecated .hide in favor of .hidden or .sr-only (as appropriate) in v3.0.1
 .hide {
-  display: none;
+  display: none !important;
 }
 .show {
-  display: block;
+  display: block !important;
 }
-
-// Visibility
 .invisible {
   visibility: hidden;
 }
-
-// For Affix plugin
-.affix {
-  position: fixed;
+.text-hide {
+  @include text-hide();
 }
 
-// Clearing floats
-.clearfix {
-  @include clearfix();
-}
 
-// Accessible yet invisible text
-.hide-text {
-  @include hide-text();
+// Hide from screenreaders and browsers
+//
+// Credit: HTML5 Boilerplate
+
+.hidden {
+  display: none !important;
+  visibility: hidden !important;
 }
 
-// Uses box-sizing mixin, so must be defined here
-.input-block-level {
-  @include input-block-level();
+
+// For Affix plugin
+// -------------------------
+
+.affix {
+  position: fixed;
+  @include translate3d(0, 0, 0);
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_variables.scss b/app/assets/stylesheets/rails_admin/bootstrap/_variables.scss
old mode 100755
new mode 100644
index 741df187e0..fe72e8413f
--- a/app/assets/stylesheets/rails_admin/bootstrap/_variables.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_variables.scss
@@ -1,301 +1,850 @@
+// a flag to toggle asset pipeline / compass integration
+// defaults to true if twbs-font-path function is present (no function => twbs-font-path('') parsed as string == right side)
+// in Sass 3.3 this can be improved with: function-exists(twbs-font-path)
+$bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")')) !default;
 //
 // Variables
 // --------------------------------------------------
 
 
-// Global values
-// --------------------------------------------------
+//== Colors
+//
+//## Gray and brand colors for use across Bootstrap.
 
+$gray-darker:            lighten(#000, 13.5%) !default; // #222
+$gray-dark:              lighten(#000, 20%) !default;   // #333
+$gray:                   lighten(#000, 33.5%) !default; // #555
+$gray-light:             lighten(#000, 46.7%) !default; // #777
+$gray-lighter:           lighten(#000, 93.5%) !default; // #eee
 
-// Grays
-// -------------------------
-$black:                 #000 !default;
-$grayDarker:            #222 !default;
-$grayDark:              #333 !default;
-$gray:                  #555 !default;
-$grayLight:             #999 !default;
-$grayLighter:           #eee !default;
-$white:                 #fff !default;
+$brand-primary:         #428bca !default;
+$brand-success:         #5cb85c !default;
+$brand-info:            #5bc0de !default;
+$brand-warning:         #f0ad4e !default;
+$brand-danger:          #d9534f !default;
 
 
-// Accent colors
-// -------------------------
-$blue:                  #049cdb !default;
-$blueDark:              #0064cd !default;
-$green:                 #46a546 !default;
-$red:                   #9d261d !default;
-$yellow:                #ffc40d !default;
-$orange:                #f89406 !default;
-$pink:                  #c3325f !default;
-$purple:                #7a43b6 !default;
+//== Scaffolding
+//
+//## Settings for some of the most global styles.
 
+//** Background color for `<body>`.
+$body-bg:               #fff !default;
+//** Global text color on `<body>`.
+$text-color:            $gray-dark !default;
 
-// Scaffolding
-// -------------------------
-$bodyBackground:        $white !default;
-$textColor:             $grayDark !default;
+//** Global textual link color.
+$link-color:            $brand-primary !default;
+//** Link hover color set via `darken()` function.
+$link-hover-color:      darken($link-color, 15%) !default;
 
 
-// Links
-// -------------------------
-$linkColor:             #08c !default;
-$linkColorHover:        darken($linkColor, 15%) !default;
+//== Typography
+//
+//## Font, line-height, and color for body text, headings, and more.
+
+$font-family-sans-serif:  "Helvetica Neue", Helvetica, Arial, sans-serif !default;
+$font-family-serif:       Georgia, "Times New Roman", Times, serif !default;
+//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
+$font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace !default;
+$font-family-base:        $font-family-sans-serif !default;
+
+$font-size-base:          14px !default;
+$font-size-large:         ceil(($font-size-base * 1.25)) !default; // ~18px
+$font-size-small:         ceil(($font-size-base * 0.85)) !default; // ~12px
+
+$font-size-h1:            floor(($font-size-base * 2.6)) !default; // ~36px
+$font-size-h2:            floor(($font-size-base * 2.15)) !default; // ~30px
+$font-size-h3:            ceil(($font-size-base * 1.7)) !default; // ~24px
+$font-size-h4:            ceil(($font-size-base * 1.25)) !default; // ~18px
+$font-size-h5:            $font-size-base !default;
+$font-size-h6:            ceil(($font-size-base * 0.85)) !default; // ~12px
+
+//** Unit-less `line-height` for use in components like buttons.
+$line-height-base:        1.428571429 !default; // 20/14
+//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
+$line-height-computed:    floor(($font-size-base * $line-height-base)) !default; // ~20px
+
+//** By default, this inherits from the `<body>`.
+$headings-font-family:    inherit !default;
+$headings-font-weight:    500 !default;
+$headings-line-height:    1.1 !default;
+$headings-color:          inherit !default;
+
+
+//== Iconography
+//
+//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
 
+//** Load fonts from this directory.
+$icon-font-path: "bootstrap/" !default;
+//** File name for all font files.
+$icon-font-name:          "glyphicons-halflings-regular" !default;
+//** Element ID within SVG icon file.
+$icon-font-svg-id:        "glyphicons_halflingsregular" !default;
 
-// Typography
-// -------------------------
-$sansFontFamily:        "Helvetica Neue", Helvetica, Arial, sans-serif !default;
-$serifFontFamily:       Georgia, "Times New Roman", Times, serif !default;
-$monoFontFamily:        Monaco, Menlo, Consolas, "Courier New", monospace !default;
 
-$baseFontSize:          14px !default;
-$baseFontFamily:        $sansFontFamily !default;
-$baseLineHeight:        20px !default;
-$altFontFamily:         $serifFontFamily !default;
+//== Components
+//
+//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
 
-$headingsFontFamily:    inherit !default; // empty to use BS default, $baseFontFamily
-$headingsFontWeight:    bold !default;    // instead of browser default, bold
-$headingsColor:         inherit !default; // empty to use BS default, $textColor
+$padding-base-vertical:     6px !default;
+$padding-base-horizontal:   12px !default;
 
+$padding-large-vertical:    10px !default;
+$padding-large-horizontal:  16px !default;
 
-// Component sizing
-// -------------------------
-// Based on 14px font-size and 20px line-height
+$padding-small-vertical:    5px !default;
+$padding-small-horizontal:  10px !default;
 
-$fontSizeLarge:         $baseFontSize * 1.25 !default; // ~18px
-$fontSizeSmall:         $baseFontSize * 0.85 !default; // ~12px
-$fontSizeMini:          $baseFontSize * 0.75 !default; // ~11px
+$padding-xs-vertical:       1px !default;
+$padding-xs-horizontal:     5px !default;
 
-$paddingLarge:          11px 19px !default; // 44px
-$paddingSmall:          2px 10px !default;  // 26px
-$paddingMini:           0px 6px !default;   // 22px
+$line-height-large:         1.33 !default;
+$line-height-small:         1.5 !default;
 
-$baseBorderRadius:      4px !default;
-$borderRadiusLarge:     6px !default;
-$borderRadiusSmall:     3px !default;
+$border-radius-base:        4px !default;
+$border-radius-large:       6px !default;
+$border-radius-small:       3px !default;
 
+//** Global color for active items (e.g., navs or dropdowns).
+$component-active-color:    #fff !default;
+//** Global background color for active items (e.g., navs or dropdowns).
+$component-active-bg:       $brand-primary !default;
 
-// Tables
-// -------------------------
-$tableBackground:                   transparent !default; // overall background-color
-$tableBackgroundAccent:             #f9f9f9 !default; // for striping
-$tableBackgroundHover:              #f5f5f5 !default; // for hover
-$tableBorder:                       #ddd !default; // table and cell border
+//** Width of the `border` for generating carets that indicator dropdowns.
+$caret-width-base:          4px !default;
+//** Carets increase slightly in size for larger components.
+$caret-width-large:         5px !default;
 
-// Buttons
-// -------------------------
-$btnBackground:                     $white !default;
-$btnBackgroundHighlight:            darken($white, 10%) !default;
-$btnBorder:                         #ccc !default;
 
-$btnPrimaryBackground:              $linkColor !default;
-$btnPrimaryBackgroundHighlight:     adjust-hue($btnPrimaryBackground, 20%) !default;
+//== Tables
+//
+//## Customizes the `.table` component with basic values, each used across all table variations.
 
-$btnInfoBackground:                 #5bc0de !default;
-$btnInfoBackgroundHighlight:        #2f96b4 !default;
+//** Padding for `<th>`s and `<td>`s.
+$table-cell-padding:            8px !default;
+//** Padding for cells in `.table-condensed`.
+$table-condensed-cell-padding:  5px !default;
 
-$btnSuccessBackground:              #62c462 !default;
-$btnSuccessBackgroundHighlight:     #51a351 !default;
+//** Default background color used for all tables.
+$table-bg:                      transparent !default;
+//** Background color used for `.table-striped`.
+$table-bg-accent:               #f9f9f9 !default;
+//** Background color used for `.table-hover`.
+$table-bg-hover:                #f5f5f5 !default;
+$table-bg-active:               $table-bg-hover !default;
 
-$btnWarningBackground:              lighten($orange, 15%) !default;
-$btnWarningBackgroundHighlight:     $orange !default;
+//** Border color for table and cell borders.
+$table-border-color:            #ddd !default;
 
-$btnDangerBackground:               #ee5f5b !default;
-$btnDangerBackgroundHighlight:      #bd362f !default;
 
-$btnInverseBackground:              #444 !default;
-$btnInverseBackgroundHighlight:     $grayDarker !default;
+//== Buttons
+//
+//## For each of Bootstrap's buttons, define text, background and border color.
 
+$btn-font-weight:                normal !default;
 
-// Forms
-// -------------------------
-$inputBackground:               $white !default;
-$inputBorder:                   #ccc !default;
-$inputBorderRadius:             $baseBorderRadius !default;
-$inputDisabledBackground:       $grayLighter !default;
-$formActionsBackground:         #f5f5f5 !default;
-$inputHeight:                   $baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
+$btn-default-color:              #333 !default;
+$btn-default-bg:                 #fff !default;
+$btn-default-border:             #ccc !default;
 
+$btn-primary-color:              #fff !default;
+$btn-primary-bg:                 $brand-primary !default;
+$btn-primary-border:             darken($btn-primary-bg, 5%) !default;
 
-// Dropdowns
-// -------------------------
-$dropdownBackground:            $white !default;
-$dropdownBorder:                rgba(0,0,0,.2) !default;
-$dropdownDividerTop:            #e5e5e5 !default;
-$dropdownDividerBottom:         $white !default;
+$btn-success-color:              #fff !default;
+$btn-success-bg:                 $brand-success !default;
+$btn-success-border:             darken($btn-success-bg, 5%) !default;
 
-$dropdownLinkColor:             $grayDark !default;
-$dropdownLinkColorHover:        $white !default;
-$dropdownLinkColorActive:       $white !default;
+$btn-info-color:                 #fff !default;
+$btn-info-bg:                    $brand-info !default;
+$btn-info-border:                darken($btn-info-bg, 5%) !default;
 
-$dropdownLinkBackgroundActive:  $linkColor !default;
-$dropdownLinkBackgroundHover:   $dropdownLinkBackgroundActive !default;
+$btn-warning-color:              #fff !default;
+$btn-warning-bg:                 $brand-warning !default;
+$btn-warning-border:             darken($btn-warning-bg, 5%) !default;
 
+$btn-danger-color:               #fff !default;
+$btn-danger-bg:                  $brand-danger !default;
+$btn-danger-border:              darken($btn-danger-bg, 5%) !default;
 
+$btn-link-disabled-color:        $gray-light !default;
 
-// COMPONENT VARIABLES
-// --------------------------------------------------
 
+//== Forms
+//
+//##
+
+//** `<input>` background color
+$input-bg:                       #fff !default;
+//** `<input disabled>` background color
+$input-bg-disabled:              $gray-lighter !default;
+
+//** Text color for `<input>`s
+$input-color:                    $gray !default;
+//** `<input>` border color
+$input-border:                   #ccc !default;
+//** `<input>` border radius
+$input-border-radius:            $border-radius-base !default;
+//** Border color for inputs on focus
+$input-border-focus:             #66afe9 !default;
+
+//** Placeholder text color
+$input-color-placeholder:        $gray-light !default;
+
+//** Default `.form-control` height
+$input-height-base:              ($line-height-computed + ($padding-base-vertical * 2) + 2) !default;
+//** Large `.form-control` height
+$input-height-large:             (ceil($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) !default;
+//** Small `.form-control` height
+$input-height-small:             (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
+
+$legend-color:                   $gray-dark !default;
+$legend-border-color:            #e5e5e5 !default;
+
+//** Background color for textual input addons
+$input-group-addon-bg:           $gray-lighter !default;
+//** Border color for textual input addons
+$input-group-addon-border-color: $input-border !default;
+
+
+//== Dropdowns
+//
+//## Dropdown menu container and contents.
 
-// Z-index master list
-// -------------------------
-// Used for a bird's eye view of components dependent on the z-axis
-// Try to avoid customizing these :)
-$zindexDropdown:          1000 !default;
-$zindexPopover:           1010 !default;
-$zindexTooltip:           1030 !default;
-$zindexFixedNavbar:       1030 !default;
-$zindexModalBackdrop:     1040 !default;
-$zindexModal:             1050 !default;
+//** Background for the dropdown menu.
+$dropdown-bg:                    #fff !default;
+//** Dropdown menu `border-color`.
+$dropdown-border:                rgba(0,0,0,.15) !default;
+//** Dropdown menu `border-color` **for IE8**.
+$dropdown-fallback-border:       #ccc !default;
+//** Divider color for between dropdown items.
+$dropdown-divider-bg:            #e5e5e5 !default;
 
+//** Dropdown link text color.
+$dropdown-link-color:            $gray-dark !default;
+//** Hover color for dropdown links.
+$dropdown-link-hover-color:      darken($gray-dark, 5%) !default;
+//** Hover background for dropdown links.
+$dropdown-link-hover-bg:         #f5f5f5 !default;
 
-// Sprite icons path
-// -------------------------
-$iconSpritePath:          image-path("rails_admin/bootstrap/glyphicons-halflings.png") !default;
-$iconWhiteSpritePath:     image-path("rails_admin/bootstrap/glyphicons-halflings-white.png") !default;
+//** Active dropdown menu item text color.
+$dropdown-link-active-color:     $component-active-color !default;
+//** Active dropdown menu item background color.
+$dropdown-link-active-bg:        $component-active-bg !default;
 
+//** Disabled dropdown menu item background color.
+$dropdown-link-disabled-color:   $gray-light !default;
 
-// Input placeholder text color
-// -------------------------
-$placeholderText:         $grayLight !default;
+//** Text color for headers within dropdown menus.
+$dropdown-header-color:          $gray-light !default;
 
+//** Deprecated `$dropdown-caret-color` as of v3.1.0
+$dropdown-caret-color:           #000 !default;
 
-// Hr border color
-// -------------------------
-$hrBorder:                $grayLighter !default;
 
+//-- Z-index master list
+//
+// Warning: Avoid customizing these values. They're used for a bird's eye view
+// of components dependent on the z-axis and are designed to all work together.
+//
+// Note: These variables are not generated into the Customizer.
 
-// Horizontal forms & lists
-// -------------------------
-$horizontalComponentOffset:       180px !default;
+$zindex-navbar:            1000 !default;
+$zindex-dropdown:          1000 !default;
+$zindex-popover:           1060 !default;
+$zindex-tooltip:           1070 !default;
+$zindex-navbar-fixed:      1030 !default;
+$zindex-modal-background:  1040 !default;
+$zindex-modal:             1050 !default;
 
 
-// Wells
-// -------------------------
-$wellBackground:                  #f5f5f5 !default;
+//== Media queries breakpoints
+//
+//## Define the breakpoints at which your layout will change, adapting to different screen sizes.
+
+// Extra small screen / phone
+//** Deprecated `$screen-xs` as of v3.0.1
+$screen-xs:                  480px !default;
+//** Deprecated `$screen-xs-min` as of v3.2.0
+$screen-xs-min:              $screen-xs !default;
+//** Deprecated `$screen-phone` as of v3.0.1
+$screen-phone:               $screen-xs-min !default;
+
+// Small screen / tablet
+//** Deprecated `$screen-sm` as of v3.0.1
+$screen-sm:                  768px !default;
+$screen-sm-min:              $screen-sm !default;
+//** Deprecated `$screen-tablet` as of v3.0.1
+$screen-tablet:              $screen-sm-min !default;
+
+// Medium screen / desktop
+//** Deprecated `$screen-md` as of v3.0.1
+$screen-md:                  992px !default;
+$screen-md-min:              $screen-md !default;
+//** Deprecated `$screen-desktop` as of v3.0.1
+$screen-desktop:             $screen-md-min !default;
+
+// Large screen / wide desktop
+//** Deprecated `$screen-lg` as of v3.0.1
+$screen-lg:                  1200px !default;
+$screen-lg-min:              $screen-lg !default;
+//** Deprecated `$screen-lg-desktop` as of v3.0.1
+$screen-lg-desktop:          $screen-lg-min !default;
+
+// So media queries don't overlap when required, provide a maximum
+$screen-xs-max:              ($screen-sm-min - 1) !default;
+$screen-sm-max:              ($screen-md-min - 1) !default;
+$screen-md-max:              ($screen-lg-min - 1) !default;
+
+
+//== Grid system
+//
+//## Define your custom responsive grid.
+
+//** Number of columns in the grid.
+$grid-columns:              12 !default;
+//** Padding between columns. Gets divided in half for the left and right.
+$grid-gutter-width:         30px !default;
+// Navbar collapse
+//** Point at which the navbar becomes uncollapsed.
+$grid-float-breakpoint:     $screen-sm-min !default;
+//** Point at which the navbar begins collapsing.
+$grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
+
+
+//== Container sizes
+//
+//## Define the maximum width of `.container` for different screen sizes.
 
+// Small screen / tablet
+$container-tablet:             ((720px + $grid-gutter-width)) !default;
+//** For `$screen-sm-min` and up.
+$container-sm:                 $container-tablet !default;
 
-// Navbar
-// -------------------------
-$navbarCollapseWidth:             979px !default;
-$navbarCollapseDesktopWidth:      $navbarCollapseWidth + 1;
+// Medium screen / desktop
+$container-desktop:            ((940px + $grid-gutter-width)) !default;
+//** For `$screen-md-min` and up.
+$container-md:                 $container-desktop !default;
 
-$navbarHeight:                    40px !default;
-$navbarBackgroundHighlight:       #ffffff !default;
-$navbarBackground:                darken($navbarBackgroundHighlight, 5%) !default;
-$navbarBorder:                    darken($navbarBackground, 12%) !default;
+// Large screen / wide desktop
+$container-large-desktop:      ((1140px + $grid-gutter-width)) !default;
+//** For `$screen-lg-min` and up.
+$container-lg:                 $container-large-desktop !default;
 
-$navbarText:                      #777 !default;
-$navbarLinkColor:                 #777 !default;
-$navbarLinkColorHover:            $grayDark !default;
-$navbarLinkColorActive:           $gray !default;
-$navbarLinkBackgroundHover:       transparent !default;
-$navbarLinkBackgroundActive:      darken($navbarBackground, 5%) !default;
 
-$navbarBrandColor:                $navbarLinkColor !default;
+//== Navbar
+//
+//##
+
+// Basics of a navbar
+$navbar-height:                    50px !default;
+$navbar-margin-bottom:             $line-height-computed !default;
+$navbar-border-radius:             $border-radius-base !default;
+$navbar-padding-horizontal:        floor(($grid-gutter-width / 2)) !default;
+$navbar-padding-vertical:          (($navbar-height - $line-height-computed) / 2) !default;
+$navbar-collapse-max-height:       340px !default;
+
+$navbar-default-color:             #777 !default;
+$navbar-default-bg:                #f8f8f8 !default;
+$navbar-default-border:            darken($navbar-default-bg, 6.5%) !default;
+
+// Navbar links
+$navbar-default-link-color:                #777 !default;
+$navbar-default-link-hover-color:          #333 !default;
+$navbar-default-link-hover-bg:             transparent !default;
+$navbar-default-link-active-color:         #555 !default;
+$navbar-default-link-active-bg:            darken($navbar-default-bg, 6.5%) !default;
+$navbar-default-link-disabled-color:       #ccc !default;
+$navbar-default-link-disabled-bg:          transparent !default;
+
+// Navbar brand label
+$navbar-default-brand-color:               $navbar-default-link-color !default;
+$navbar-default-brand-hover-color:         darken($navbar-default-brand-color, 10%) !default;
+$navbar-default-brand-hover-bg:            transparent !default;
+
+// Navbar toggle
+$navbar-default-toggle-hover-bg:           #ddd !default;
+$navbar-default-toggle-icon-bar-bg:        #888 !default;
+$navbar-default-toggle-border-color:       #ddd !default;
+
 
 // Inverted navbar
-$navbarInverseBackground:                #111111 !default;
-$navbarInverseBackgroundHighlight:       #222222 !default;
-$navbarInverseBorder:                    #252525 !default;
+// Reset inverted navbar basics
+$navbar-inverse-color:                      $gray-light !default;
+$navbar-inverse-bg:                         #222 !default;
+$navbar-inverse-border:                     darken($navbar-inverse-bg, 10%) !default;
+
+// Inverted navbar links
+$navbar-inverse-link-color:                 $gray-light !default;
+$navbar-inverse-link-hover-color:           #fff !default;
+$navbar-inverse-link-hover-bg:              transparent !default;
+$navbar-inverse-link-active-color:          $navbar-inverse-link-hover-color !default;
+$navbar-inverse-link-active-bg:             darken($navbar-inverse-bg, 10%) !default;
+$navbar-inverse-link-disabled-color:        #444 !default;
+$navbar-inverse-link-disabled-bg:           transparent !default;
+
+// Inverted navbar brand label
+$navbar-inverse-brand-color:                $navbar-inverse-link-color !default;
+$navbar-inverse-brand-hover-color:          #fff !default;
+$navbar-inverse-brand-hover-bg:             transparent !default;
+
+// Inverted navbar toggle
+$navbar-inverse-toggle-hover-bg:            #333 !default;
+$navbar-inverse-toggle-icon-bar-bg:         #fff !default;
+$navbar-inverse-toggle-border-color:        #333 !default;
+
+
+//== Navs
+//
+//##
 
-$navbarInverseText:                      $grayLight !default;
-$navbarInverseLinkColor:                 $grayLight !default;
-$navbarInverseLinkColorHover:            $white !default;
-$navbarInverseLinkColorActive:           $navbarInverseLinkColorHover !default;
-$navbarInverseLinkBackgroundHover:       transparent !default;
-$navbarInverseLinkBackgroundActive:      $navbarInverseBackground !default;
+//=== Shared nav styles
+$nav-link-padding:                          10px 15px !default;
+$nav-link-hover-bg:                         $gray-lighter !default;
 
-$navbarInverseSearchBackground:          lighten($navbarInverseBackground, 25%) !default;
-$navbarInverseSearchBackgroundFocus:     $white !default;
-$navbarInverseSearchBorder:              $navbarInverseBackground !default;
-$navbarInverseSearchPlaceholderColor:    #ccc !default;
+$nav-disabled-link-color:                   $gray-light !default;
+$nav-disabled-link-hover-color:             $gray-light !default;
 
-$navbarInverseBrandColor:                $navbarInverseLinkColor !default;
+$nav-open-link-hover-color:                 #fff !default;
 
+//== Tabs
+$nav-tabs-border-color:                     #ddd !default;
 
-// Pagination
-// -------------------------
-$paginationBackground:                #fff !default;
-$paginationBorder:                    #ddd !default;
-$paginationActiveBackground:          #f5f5f5 !default;
+$nav-tabs-link-hover-border-color:          $gray-lighter !default;
 
+$nav-tabs-active-link-hover-bg:             $body-bg !default;
+$nav-tabs-active-link-hover-color:          $gray !default;
+$nav-tabs-active-link-hover-border-color:   #ddd !default;
 
-// Hero unit
-// -------------------------
-$heroUnitBackground:              $grayLighter !default;
-$heroUnitHeadingColor:            inherit !default;
-$heroUnitLeadColor:               inherit !default;
+$nav-tabs-justified-link-border-color:            #ddd !default;
+$nav-tabs-justified-active-link-border-color:     $body-bg !default;
 
+//== Pills
+$nav-pills-border-radius:                   $border-radius-base !default;
+$nav-pills-active-link-hover-bg:            $component-active-bg !default;
+$nav-pills-active-link-hover-color:         $component-active-color !default;
 
-// Form states and alerts
-// -------------------------
-$warningText:             #c09853 !default;
-$warningBackground:       #fcf8e3 !default;
-$warningBorder:           darken(adjust-hue($warningBackground, -10), 3%) !default;
 
-$errorText:               #b94a48 !default;
-$errorBackground:         #f2dede !default;
-$errorBorder:             darken(adjust-hue($errorBackground, -10), 3%) !default;
+//== Pagination
+//
+//##
 
-$successText:             #468847 !default;
-$successBackground:       #dff0d8 !default;
-$successBorder:           darken(adjust-hue($successBackground, -10), 5%) !default;
+$pagination-color:                     $link-color !default;
+$pagination-bg:                        #fff !default;
+$pagination-border:                    #ddd !default;
 
-$infoText:                #3a87ad !default;
-$infoBackground:          #d9edf7 !default;
-$infoBorder:              darken(adjust-hue($infoBackground, -10), 7%) !default;
+$pagination-hover-color:               $link-hover-color !default;
+$pagination-hover-bg:                  $gray-lighter !default;
+$pagination-hover-border:              #ddd !default;
 
+$pagination-active-color:              #fff !default;
+$pagination-active-bg:                 $brand-primary !default;
+$pagination-active-border:             $brand-primary !default;
 
-// Tooltips and popovers
-// -------------------------
-$tooltipColor:            #fff !default;
-$tooltipBackground:       #000 !default;
-$tooltipArrowWidth:       5px !default;
-$tooltipArrowColor:       $tooltipBackground !default;
+$pagination-disabled-color:            $gray-light !default;
+$pagination-disabled-bg:               #fff !default;
+$pagination-disabled-border:           #ddd !default;
 
-$popoverBackground:       #fff !default;
-$popoverArrowWidth:       10px !default;
-$popoverArrowColor:       #fff !default;
-$popoverTitleBackground:  darken($popoverBackground, 3%) !default;
 
-// Special enhancement for popovers
-$popoverArrowOuterWidth:  $popoverArrowWidth + 1 !default;
-$popoverArrowOuterColor:  rgba(0,0,0,.25) !default;
+//== Pager
+//
+//##
 
+$pager-bg:                             $pagination-bg !default;
+$pager-border:                         $pagination-border !default;
+$pager-border-radius:                  15px !default;
 
+$pager-hover-bg:                       $pagination-hover-bg !default;
 
-// GRID
-// --------------------------------------------------
+$pager-active-bg:                      $pagination-active-bg !default;
+$pager-active-color:                   $pagination-active-color !default;
 
+$pager-disabled-color:                 $pagination-disabled-color !default;
 
-// Default 940px grid
-// -------------------------
-$gridColumns:             12 !default;
-$gridColumnWidth:         60px !default;
-$gridGutterWidth:         20px !default;
-$gridRowWidth:            ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1)) !default;
 
-// 1200px min
-$gridColumnWidth1200:     70px !default;
-$gridGutterWidth1200:     30px !default;
-$gridRowWidth1200:        ($gridColumns * $gridColumnWidth1200) + ($gridGutterWidth1200 * ($gridColumns - 1)) !default;
+//== Jumbotron
+//
+//##
+
+$jumbotron-padding:              30px !default;
+$jumbotron-color:                inherit !default;
+$jumbotron-bg:                   $gray-lighter !default;
+$jumbotron-heading-color:        inherit !default;
+$jumbotron-font-size:            ceil(($font-size-base * 1.5)) !default;
+
+
+//== Form states and alerts
+//
+//## Define colors for form feedback states and, by default, alerts.
+
+$state-success-text:             #3c763d !default;
+$state-success-bg:               #dff0d8 !default;
+$state-success-border:           darken(adjust-hue($state-success-bg, -10), 5%) !default;
+
+$state-info-text:                #31708f !default;
+$state-info-bg:                  #d9edf7 !default;
+$state-info-border:              darken(adjust-hue($state-info-bg, -10), 7%) !default;
+
+$state-warning-text:             #8a6d3b !default;
+$state-warning-bg:               #fcf8e3 !default;
+$state-warning-border:           darken(adjust-hue($state-warning-bg, -10), 5%) !default;
+
+$state-danger-text:              #a94442 !default;
+$state-danger-bg:                #f2dede !default;
+$state-danger-border:            darken(adjust-hue($state-danger-bg, -10), 5%) !default;
+
+
+//== Tooltips
+//
+//##
+
+//** Tooltip max width
+$tooltip-max-width:           200px !default;
+//** Tooltip text color
+$tooltip-color:               #fff !default;
+//** Tooltip background color
+$tooltip-bg:                  #000 !default;
+$tooltip-opacity:             .9 !default;
 
-// 768px-979px
-$gridColumnWidth768:      42px !default;
-$gridGutterWidth768:      20px !default;
-$gridRowWidth768:         ($gridColumns * $gridColumnWidth768) + ($gridGutterWidth768 * ($gridColumns - 1)) !default;
+//** Tooltip arrow width
+$tooltip-arrow-width:         5px !default;
+//** Tooltip arrow color
+$tooltip-arrow-color:         $tooltip-bg !default;
 
 
-// Fluid grid
-// -------------------------
-$fluidGridColumnWidth:    percentage($gridColumnWidth/$gridRowWidth) !default;
-$fluidGridGutterWidth:    percentage($gridGutterWidth/$gridRowWidth) !default;
+//== Popovers
+//
+//##
+
+//** Popover body background color
+$popover-bg:                          #fff !default;
+//** Popover maximum width
+$popover-max-width:                   276px !default;
+//** Popover border color
+$popover-border-color:                rgba(0,0,0,.2) !default;
+//** Popover fallback border color
+$popover-fallback-border-color:       #ccc !default;
+
+//** Popover title background color
+$popover-title-bg:                    darken($popover-bg, 3%) !default;
+
+//** Popover arrow width
+$popover-arrow-width:                 10px !default;
+//** Popover arrow color
+$popover-arrow-color:                 #fff !default;
+
+//** Popover outer arrow width
+$popover-arrow-outer-width:           ($popover-arrow-width + 1) !default;
+//** Popover outer arrow color
+$popover-arrow-outer-color:           fade_in($popover-border-color, 0.05) !default;
+//** Popover outer arrow fallback color
+$popover-arrow-outer-fallback-color:  darken($popover-fallback-border-color, 20%) !default;
+
+
+//== Labels
+//
+//##
+
+//** Default label background color
+$label-default-bg:            $gray-light !default;
+//** Primary label background color
+$label-primary-bg:            $brand-primary !default;
+//** Success label background color
+$label-success-bg:            $brand-success !default;
+//** Info label background color
+$label-info-bg:               $brand-info !default;
+//** Warning label background color
+$label-warning-bg:            $brand-warning !default;
+//** Danger label background color
+$label-danger-bg:             $brand-danger !default;
+
+//** Default label text color
+$label-color:                 #fff !default;
+//** Default text color of a linked label
+$label-link-hover-color:      #fff !default;
+
+
+//== Modals
+//
+//##
+
+//** Padding applied to the modal body
+$modal-inner-padding:         15px !default;
+
+//** Padding applied to the modal title
+$modal-title-padding:         15px !default;
+//** Modal title line-height
+$modal-title-line-height:     $line-height-base !default;
+
+//** Background color of modal content area
+$modal-content-bg:                             #fff !default;
+//** Modal content border color
+$modal-content-border-color:                   rgba(0,0,0,.2) !default;
+//** Modal content border color **for IE8**
+$modal-content-fallback-border-color:          #999 !default;
+
+//** Modal backdrop background color
+$modal-backdrop-bg:           #000 !default;
+//** Modal backdrop opacity
+$modal-backdrop-opacity:      .5 !default;
+//** Modal header border color
+$modal-header-border-color:   #e5e5e5 !default;
+//** Modal footer border color
+$modal-footer-border-color:   $modal-header-border-color !default;
+
+$modal-lg:                    900px !default;
+$modal-md:                    600px !default;
+$modal-sm:                    300px !default;
+
+
+//== Alerts
+//
+//## Define alert colors, border radius, and padding.
+
+$alert-padding:               15px !default;
+$alert-border-radius:         $border-radius-base !default;
+$alert-link-font-weight:      bold !default;
+
+$alert-success-bg:            $state-success-bg !default;
+$alert-success-text:          $state-success-text !default;
+$alert-success-border:        $state-success-border !default;
+
+$alert-info-bg:               $state-info-bg !default;
+$alert-info-text:             $state-info-text !default;
+$alert-info-border:           $state-info-border !default;
+
+$alert-warning-bg:            $state-warning-bg !default;
+$alert-warning-text:          $state-warning-text !default;
+$alert-warning-border:        $state-warning-border !default;
+
+$alert-danger-bg:             $state-danger-bg !default;
+$alert-danger-text:           $state-danger-text !default;
+$alert-danger-border:         $state-danger-border !default;
+
+
+//== Progress bars
+//
+//##
+
+//** Background color of the whole progress component
+$progress-bg:                 #f5f5f5 !default;
+//** Progress bar text color
+$progress-bar-color:          #fff !default;
+
+//** Default progress bar color
+$progress-bar-bg:             $brand-primary !default;
+//** Success progress bar color
+$progress-bar-success-bg:     $brand-success !default;
+//** Warning progress bar color
+$progress-bar-warning-bg:     $brand-warning !default;
+//** Danger progress bar color
+$progress-bar-danger-bg:      $brand-danger !default;
+//** Info progress bar color
+$progress-bar-info-bg:        $brand-info !default;
+
+
+//== List group
+//
+//##
+
+//** Background color on `.list-group-item`
+$list-group-bg:                 #fff !default;
+//** `.list-group-item` border color
+$list-group-border:             #ddd !default;
+//** List group border radius
+$list-group-border-radius:      $border-radius-base !default;
+
+//** Background color of single list items on hover
+$list-group-hover-bg:           #f5f5f5 !default;
+//** Text color of active list items
+$list-group-active-color:       $component-active-color !default;
+//** Background color of active list items
+$list-group-active-bg:          $component-active-bg !default;
+//** Border color of active list elements
+$list-group-active-border:      $list-group-active-bg !default;
+//** Text color for content within active list items
+$list-group-active-text-color:  lighten($list-group-active-bg, 40%) !default;
+
+//** Text color of disabled list items
+$list-group-disabled-color:      $gray-light !default;
+//** Background color of disabled list items
+$list-group-disabled-bg:         $gray-lighter !default;
+//** Text color for content within disabled list items
+$list-group-disabled-text-color: $list-group-disabled-color !default;
+
+$list-group-link-color:         #555 !default;
+$list-group-link-hover-color:   $list-group-link-color !default;
+$list-group-link-heading-color: #333 !default;
+
+
+//== Panels
+//
+//##
+
+$panel-bg:                    #fff !default;
+$panel-body-padding:          15px !default;
+$panel-heading-padding:       10px 15px !default;
+$panel-footer-padding:        $panel-heading-padding !default;
+$panel-border-radius:         $border-radius-base !default;
+
+//** Border color for elements within panels
+$panel-inner-border:          #ddd !default;
+$panel-footer-bg:             #f5f5f5 !default;
+
+$panel-default-text:          $gray-dark !default;
+$panel-default-border:        #ddd !default;
+$panel-default-heading-bg:    #f5f5f5 !default;
+
+$panel-primary-text:          #fff !default;
+$panel-primary-border:        $brand-primary !default;
+$panel-primary-heading-bg:    $brand-primary !default;
+
+$panel-success-text:          $state-success-text !default;
+$panel-success-border:        $state-success-border !default;
+$panel-success-heading-bg:    $state-success-bg !default;
+
+$panel-info-text:             $state-info-text !default;
+$panel-info-border:           $state-info-border !default;
+$panel-info-heading-bg:       $state-info-bg !default;
+
+$panel-warning-text:          $state-warning-text !default;
+$panel-warning-border:        $state-warning-border !default;
+$panel-warning-heading-bg:    $state-warning-bg !default;
+
+$panel-danger-text:           $state-danger-text !default;
+$panel-danger-border:         $state-danger-border !default;
+$panel-danger-heading-bg:     $state-danger-bg !default;
+
+
+//== Thumbnails
+//
+//##
+
+//** Padding around the thumbnail image
+$thumbnail-padding:           4px !default;
+//** Thumbnail background color
+$thumbnail-bg:                $body-bg !default;
+//** Thumbnail border color
+$thumbnail-border:            #ddd !default;
+//** Thumbnail border radius
+$thumbnail-border-radius:     $border-radius-base !default;
+
+//** Custom text color for thumbnail captions
+$thumbnail-caption-color:     $text-color !default;
+//** Padding around the thumbnail caption
+$thumbnail-caption-padding:   9px !default;
+
+
+//== Wells
+//
+//##
+
+$well-bg:                     #f5f5f5 !default;
+$well-border:                 darken($well-bg, 7%) !default;
+
+
+//== Badges
+//
+//##
+
+$badge-color:                 #fff !default;
+//** Linked badge text color on hover
+$badge-link-hover-color:      #fff !default;
+$badge-bg:                    $gray-light !default;
+
+//** Badge text color in active nav link
+$badge-active-color:          $link-color !default;
+//** Badge background color in active nav link
+$badge-active-bg:             #fff !default;
+
+$badge-font-weight:           bold !default;
+$badge-line-height:           1 !default;
+$badge-border-radius:         10px !default;
+
+
+//== Breadcrumbs
+//
+//##
+
+$breadcrumb-padding-vertical:   8px !default;
+$breadcrumb-padding-horizontal: 15px !default;
+//** Breadcrumb background color
+$breadcrumb-bg:                 #f5f5f5 !default;
+//** Breadcrumb text color
+$breadcrumb-color:              #ccc !default;
+//** Text color of current page in the breadcrumb
+$breadcrumb-active-color:       $gray-light !default;
+//** Textual separator for between breadcrumb elements
+$breadcrumb-separator:          "/" !default;
+
+
+//== Carousel
+//
+//##
+
+$carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6) !default;
+
+$carousel-control-color:                      #fff !default;
+$carousel-control-width:                      15% !default;
+$carousel-control-opacity:                    .5 !default;
+$carousel-control-font-size:                  20px !default;
+
+$carousel-indicator-active-bg:                #fff !default;
+$carousel-indicator-border-color:             #fff !default;
+
+$carousel-caption-color:                      #fff !default;
+
+
+//== Close
+//
+//##
+
+$close-font-weight:           bold !default;
+$close-color:                 #000 !default;
+$close-text-shadow:           0 1px 0 #fff !default;
+
+
+//== Code
+//
+//##
+
+$code-color:                  #c7254e !default;
+$code-bg:                     #f9f2f4 !default;
+
+$kbd-color:                   #fff !default;
+$kbd-bg:                      #333 !default;
+
+$pre-bg:                      #f5f5f5 !default;
+$pre-color:                   $gray-dark !default;
+$pre-border-color:            #ccc !default;
+$pre-scrollable-max-height:   340px !default;
+
+
+//== Type
+//
+//##
+
+//** Horizontal offset for forms and lists.
+$component-offset-horizontal: 180px !default;
+//** Text muted color
+$text-muted:                  $gray-light !default;
+//** Abbreviations and acronyms border color
+$abbr-border-color:           $gray-light !default;
+//** Headings small color
+$headings-small-color:        $gray-light !default;
+//** Blockquote small color
+$blockquote-small-color:      $gray-light !default;
+//** Blockquote font size
+$blockquote-font-size:        ($font-size-base * 1.25) !default;
+//** Blockquote border color
+$blockquote-border-color:     $gray-lighter !default;
+//** Page header border color
+$page-header-border-color:    $gray-lighter !default;
+//** Width of horizontal description list titles
+$dl-horizontal-offset:        $component-offset-horizontal !default;
+//** Horizontal line color.
+$hr-border:                   $gray-lighter !default;
 
-// 1200px min
-$fluidGridColumnWidth1200:     percentage($gridColumnWidth1200/$gridRowWidth1200) !default;
-$fluidGridGutterWidth1200:     percentage($gridGutterWidth1200/$gridRowWidth1200) !default;
 
-// 768px-979px
-$fluidGridColumnWidth768:      percentage($gridColumnWidth768/$gridRowWidth768) !default;
-$fluidGridGutterWidth768:      percentage($gridGutterWidth768/$gridRowWidth768) !default;
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_wells.scss b/app/assets/stylesheets/rails_admin/bootstrap/_wells.scss
old mode 100755
new mode 100644
index 551e5207a7..b8657118a6
--- a/app/assets/stylesheets/rails_admin/bootstrap/_wells.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_wells.scss
@@ -8,9 +8,9 @@
   min-height: 20px;
   padding: 19px;
   margin-bottom: 20px;
-  background-color: $wellBackground;
-  border: 1px solid darken($wellBackground, 7%);
-  @include border-radius($baseBorderRadius);
+  background-color: $well-bg;
+  border: 1px solid $well-border;
+  border-radius: $border-radius-base;
   @include box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
   blockquote {
     border-color: #ddd;
@@ -19,11 +19,11 @@
 }
 
 // Sizes
-.well-large {
+.well-lg {
   padding: 24px;
-  @include border-radius($borderRadiusLarge);
+  border-radius: $border-radius-large;
 }
-.well-small {
+.well-sm {
   padding: 9px;
-  @include border-radius($borderRadiusSmall);
+  border-radius: $border-radius-small;
 }
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/bootstrap.scss b/app/assets/stylesheets/rails_admin/bootstrap/bootstrap.scss
old mode 100755
new mode 100644
index 0af339c240..4d6f8aacfd
--- a/app/assets/stylesheets/rails_admin/bootstrap/bootstrap.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/bootstrap.scss
@@ -1,63 +1,50 @@
-/*!
- * Bootstrap v2.3.2
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
 // Core variables and mixins
-@import "rails_admin/bootstrap/variables"; // Modify this for custom colors, font-sizes, etc
-@import "rails_admin/bootstrap/mixins";
-
-// CSS Reset
-@import "rails_admin/bootstrap/reset";
-
-// Grid system and page structure
-@import "rails_admin/bootstrap/scaffolding";
-@import "rails_admin/bootstrap/grid";
-@import "rails_admin/bootstrap/layouts";
-
-// Base CSS
-@import "rails_admin/bootstrap/type";
-@import "rails_admin/bootstrap/code";
-@import "rails_admin/bootstrap/forms";
-@import "rails_admin/bootstrap/tables";
-
-// Components: common
-@import "rails_admin/bootstrap/sprites";
-@import "rails_admin/bootstrap/dropdowns";
-@import "rails_admin/bootstrap/wells";
-@import "rails_admin/bootstrap/component-animations";
-@import "rails_admin/bootstrap/close";
-
-// Components: Buttons & Alerts
-@import "rails_admin/bootstrap/buttons";
-@import "rails_admin/bootstrap/button-groups";
-@import "rails_admin/bootstrap/alerts"; // Note: alerts share common CSS with buttons and thus have styles in buttons
-
-// Components: Nav
-@import "rails_admin/bootstrap/navs";
-@import "rails_admin/bootstrap/navbar";
-@import "rails_admin/bootstrap/breadcrumbs";
-@import "rails_admin/bootstrap/pagination";
-@import "rails_admin/bootstrap/pager";
-
-// Components: Popovers
-@import "rails_admin/bootstrap/modals";
-@import "rails_admin/bootstrap/tooltip";
-@import "rails_admin/bootstrap/popovers";
-
-// Components: Misc
-@import "rails_admin/bootstrap/thumbnails";
-@import "rails_admin/bootstrap/media";
-@import "rails_admin/bootstrap/labels-badges";
-@import "rails_admin/bootstrap/progress-bars";
-@import "rails_admin/bootstrap/accordion";
-@import "rails_admin/bootstrap/carousel";
-@import "rails_admin/bootstrap/hero-unit";
+@import "variables";
+@import "mixins";
+
+// Reset and dependencies
+@import "normalize";
+@import "print";
+@import "glyphicons";
+
+// Core CSS
+@import "scaffolding";
+@import "type";
+@import "code";
+@import "grid";
+@import "tables";
+@import "forms";
+@import "buttons";
+
+// Components
+@import "component-animations";
+@import "dropdowns";
+@import "button-groups";
+@import "input-groups";
+@import "navs";
+@import "navbar";
+@import "breadcrumbs";
+@import "pagination";
+@import "pager";
+@import "labels";
+@import "badges";
+@import "jumbotron";
+@import "thumbnails";
+@import "alerts";
+@import "progress-bars";
+@import "media";
+@import "list-group";
+@import "panels";
+@import "responsive-embed";
+@import "wells";
+@import "close";
+
+// Components w/ JavaScript
+@import "modals";
+@import "tooltip";
+@import "popovers";
+@import "carousel";
 
 // Utility classes
-@import "rails_admin/bootstrap/utilities"; // Has to be last to override when necessary
+@import "utilities";
+@import "responsive-utilities";
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_alerts.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_alerts.scss
new file mode 100644
index 0000000000..3faf0b5a50
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_alerts.scss
@@ -0,0 +1,14 @@
+// Alerts
+
+@mixin alert-variant($background, $border, $text-color) {
+  background-color: $background;
+  border-color: $border;
+  color: $text-color;
+
+  hr {
+    border-top-color: darken($border, 5%);
+  }
+  .alert-link {
+    color: darken($text-color, 10%);
+  }
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_background-variant.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_background-variant.scss
new file mode 100644
index 0000000000..4993bd2b80
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_background-variant.scss
@@ -0,0 +1,11 @@
+// Contextual backgrounds
+
+// [converter] $parent hack
+@mixin bg-variant($parent, $color) {
+  #{$parent} {
+    background-color: $color;
+  }
+  a#{$parent}:hover {
+    background-color: darken($color, 10%);
+  }
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_border-radius.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_border-radius.scss
new file mode 100644
index 0000000000..ce19499875
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_border-radius.scss
@@ -0,0 +1,18 @@
+// Single side border-radius
+
+@mixin border-top-radius($radius) {
+  border-top-right-radius: $radius;
+   border-top-left-radius: $radius;
+}
+@mixin border-right-radius($radius) {
+  border-bottom-right-radius: $radius;
+     border-top-right-radius: $radius;
+}
+@mixin border-bottom-radius($radius) {
+  border-bottom-right-radius: $radius;
+   border-bottom-left-radius: $radius;
+}
+@mixin border-left-radius($radius) {
+  border-bottom-left-radius: $radius;
+     border-top-left-radius: $radius;
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_buttons.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_buttons.scss
new file mode 100644
index 0000000000..58ad13e502
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_buttons.scss
@@ -0,0 +1,50 @@
+// Button variants
+//
+// Easily pump out default styles, as well as :hover, :focus, :active,
+// and disabled options for all buttons
+
+@mixin button-variant($color, $background, $border) {
+  color: $color;
+  background-color: $background;
+  border-color: $border;
+
+  &:hover,
+  &:focus,
+  &:active,
+  &.active,
+  .open > &.dropdown-toggle {
+    color: $color;
+    background-color: darken($background, 10%);
+        border-color: darken($border, 12%);
+  }
+  &:active,
+  &.active,
+  .open > &.dropdown-toggle {
+    background-image: none;
+  }
+  &.disabled,
+  &[disabled],
+  fieldset[disabled] & {
+    &,
+    &:hover,
+    &:focus,
+    &:active,
+    &.active {
+      background-color: $background;
+          border-color: $border;
+    }
+  }
+
+  .badge {
+    color: $background;
+    background-color: $color;
+  }
+}
+
+// Button sizes
+@mixin button-size($padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) {
+  padding: $padding-vertical $padding-horizontal;
+  font-size: $font-size;
+  line-height: $line-height;
+  border-radius: $border-radius;
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_center-block.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_center-block.scss
new file mode 100644
index 0000000000..e06fb5e276
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_center-block.scss
@@ -0,0 +1,7 @@
+// Center-align a block level element
+
+@mixin center-block() {
+  display: block;
+  margin-left: auto;
+  margin-right: auto;
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_clearfix.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_clearfix.scss
new file mode 100644
index 0000000000..dc3e2ab426
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_clearfix.scss
@@ -0,0 +1,22 @@
+// Clearfix
+//
+// For modern browsers
+// 1. The space content is one way to avoid an Opera bug when the
+//    contenteditable attribute is included anywhere else in the document.
+//    Otherwise it causes space to appear at the top and bottom of elements
+//    that are clearfixed.
+// 2. The use of `table` rather than `block` is only necessary if using
+//    `:before` to contain the top-margins of child elements.
+//
+// Source: http://nicolasgallagher.com/micro-clearfix-hack/
+
+@mixin clearfix() {
+  &:before,
+  &:after {
+    content: " "; // 1
+    display: table; // 2
+  }
+  &:after {
+    clear: both;
+  }
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_forms.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_forms.scss
new file mode 100644
index 0000000000..ff72f0efc5
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_forms.scss
@@ -0,0 +1,84 @@
+// Form validation states
+//
+// Used in forms.less to generate the form validation CSS for warnings, errors,
+// and successes.
+
+@mixin form-control-validation($text-color: #555, $border-color: #ccc, $background-color: #f5f5f5) {
+  // Color the label and help text
+  .help-block,
+  .control-label,
+  .radio,
+  .checkbox,
+  .radio-inline,
+  .checkbox-inline  {
+    color: $text-color;
+  }
+  // Set the border and box shadow on specific inputs to match
+  .form-control {
+    border-color: $border-color;
+    @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075)); // Redeclare so transitions work
+    &:focus {
+      border-color: darken($border-color, 10%);
+      $shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten($border-color, 20%);
+      @include box-shadow($shadow);
+    }
+  }
+  // Set validation states also for addons
+  .input-group-addon {
+    color: $text-color;
+    border-color: $border-color;
+    background-color: $background-color;
+  }
+  // Optional feedback icon
+  .form-control-feedback {
+    color: $text-color;
+  }
+}
+
+
+// Form control focus state
+//
+// Generate a customized focus state and for any input with the specified color,
+// which defaults to the `$input-border-focus` variable.
+//
+// We highly encourage you to not customize the default value, but instead use
+// this to tweak colors on an as-needed basis. This aesthetic change is based on
+// WebKit's default styles, but applicable to a wider range of browsers. Its
+// usability and accessibility should be taken into account with any change.
+//
+// Example usage: change the default blue border and shadow to white for better
+// contrast against a dark gray background.
+@mixin form-control-focus($color: $input-border-focus) {
+  $color-rgba: rgba(red($color), green($color), blue($color), .6);
+  &:focus {
+    border-color: $color;
+    outline: 0;
+    @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px $color-rgba);
+  }
+}
+
+// Form control sizing
+//
+// Relative text size, padding, and border-radii changes for form controls. For
+// horizontal sizing, wrap controls in the predefined grid classes. `<select>`
+// element gets special love because it's special, and that's a fact!
+// [converter] $parent hack
+@mixin input-size($parent, $input-height, $padding-vertical, $padding-horizontal, $font-size, $line-height, $border-radius) {
+  #{$parent} {
+    height: $input-height;
+    padding: $padding-vertical $padding-horizontal;
+    font-size: $font-size;
+    line-height: $line-height;
+    border-radius: $border-radius;
+  }
+
+  select#{$parent} {
+    height: $input-height;
+    line-height: $input-height;
+  }
+
+  textarea#{$parent},
+  select[multiple]#{$parent} {
+    height: auto;
+  }
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_gradients.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_gradients.scss
new file mode 100644
index 0000000000..a8939f5ae6
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_gradients.scss
@@ -0,0 +1,58 @@
+// Gradients
+
+
+
+// Horizontal gradient, from left to right
+//
+// Creates two color stops, start and end, by specifying a color and position for each color stop.
+// Color stops are not available in IE9 and below.
+@mixin gradient-horizontal($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) {
+  background-image: -webkit-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // Safari 5.1-6, Chrome 10+
+  background-image: -o-linear-gradient(left, $start-color $start-percent, $end-color $end-percent); // Opera 12
+  background-image: linear-gradient(to right, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down
+}
+
+// Vertical gradient, from top to bottom
+//
+// Creates two color stops, start and end, by specifying a color and position for each color stop.
+// Color stops are not available in IE9 and below.
+@mixin gradient-vertical($start-color: #555, $end-color: #333, $start-percent: 0%, $end-percent: 100%) {
+  background-image: -webkit-linear-gradient(top, $start-color $start-percent, $end-color $end-percent);  // Safari 5.1-6, Chrome 10+
+  background-image: -o-linear-gradient(top, $start-color $start-percent, $end-color $end-percent);  // Opera 12
+  background-image: linear-gradient(to bottom, $start-color $start-percent, $end-color $end-percent); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
+  background-repeat: repeat-x;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down
+}
+
+@mixin gradient-directional($start-color: #555, $end-color: #333, $deg: 45deg) {
+  background-repeat: repeat-x;
+  background-image: -webkit-linear-gradient($deg, $start-color, $end-color); // Safari 5.1-6, Chrome 10+
+  background-image: -o-linear-gradient($deg, $start-color, $end-color); // Opera 12
+  background-image: linear-gradient($deg, $start-color, $end-color); // Standard, IE10, Firefox 16+, Opera 12.10+, Safari 7+, Chrome 26+
+}
+@mixin gradient-horizontal-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
+  background-image: -webkit-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color);
+  background-image: -o-linear-gradient(left, $start-color, $mid-color $color-stop, $end-color);
+  background-image: linear-gradient(to right, $start-color, $mid-color $color-stop, $end-color);
+  background-repeat: no-repeat;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=1); // IE9 and down, gets no color-stop at all for proper fallback
+}
+@mixin gradient-vertical-three-colors($start-color: #00b3ee, $mid-color: #7a43b6, $color-stop: 50%, $end-color: #c3325f) {
+  background-image: -webkit-linear-gradient($start-color, $mid-color $color-stop, $end-color);
+  background-image: -o-linear-gradient($start-color, $mid-color $color-stop, $end-color);
+  background-image: linear-gradient($start-color, $mid-color $color-stop, $end-color);
+  background-repeat: no-repeat;
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#{ie-hex-str($start-color)}', endColorstr='#{ie-hex-str($end-color)}', GradientType=0); // IE9 and down, gets no color-stop at all for proper fallback
+}
+@mixin gradient-radial($inner-color: #555, $outer-color: #333) {
+  background-image: -webkit-radial-gradient(circle, $inner-color, $outer-color);
+  background-image: radial-gradient(circle, $inner-color, $outer-color);
+  background-repeat: no-repeat;
+}
+@mixin gradient-striped($color: rgba(255,255,255,.15), $angle: 45deg) {
+  background-image: -webkit-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
+  background-image: -o-linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
+  background-image: linear-gradient($angle, $color 25%, transparent 25%, transparent 50%, $color 50%, $color 75%, transparent 75%, transparent);
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_grid-framework.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_grid-framework.scss
new file mode 100644
index 0000000000..fb28cb47d6
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_grid-framework.scss
@@ -0,0 +1,81 @@
+// Framework grid generation
+//
+// Used only by Bootstrap to generate the correct number of grid classes given
+// any value of `$grid-columns`.
+
+// [converter] This is defined recursively in LESS, but Sass supports real loops
+@mixin make-grid-columns($i: 1, $list: ".col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}") {
+  @for $i from (1 + 1) through $grid-columns {
+    $list: "#{$list}, .col-xs-#{$i}, .col-sm-#{$i}, .col-md-#{$i}, .col-lg-#{$i}";
+  }
+  #{$list} {
+    position: relative;
+    // Prevent columns from collapsing when empty
+    min-height: 1px;
+    // Inner gutter via padding
+    padding-left:  ($grid-gutter-width / 2);
+    padding-right: ($grid-gutter-width / 2);
+  }
+}
+
+
+// [converter] This is defined recursively in LESS, but Sass supports real loops
+@mixin float-grid-columns($class, $i: 1, $list: ".col-#{$class}-#{$i}") {
+  @for $i from (1 + 1) through $grid-columns {
+    $list: "#{$list}, .col-#{$class}-#{$i}";
+  }
+  #{$list} {
+    float: left;
+  }
+}
+
+
+@mixin calc-grid-column($index, $class, $type) {
+  @if ($type == width) and ($index > 0) {
+    .col-#{$class}-#{$index} {
+      width: percentage(($index / $grid-columns));
+    }
+  }
+  @if ($type == push) and ($index > 0) {
+    .col-#{$class}-push-#{$index} {
+      left: percentage(($index / $grid-columns));
+    }
+  }
+  @if ($type == push) and ($index == 0) {
+    .col-#{$class}-push-0 {
+      left: auto;
+    }
+  }
+  @if ($type == pull) and ($index > 0) {
+    .col-#{$class}-pull-#{$index} {
+      right: percentage(($index / $grid-columns));
+    }
+  }
+  @if ($type == pull) and ($index == 0) {
+    .col-#{$class}-pull-0 {
+      right: auto;
+    }
+  }
+  @if ($type == offset) {
+    .col-#{$class}-offset-#{$index} {
+      margin-left: percentage(($index / $grid-columns));
+    }
+  }
+}
+
+// [converter] This is defined recursively in LESS, but Sass supports real loops
+@mixin loop-grid-columns($columns, $class, $type) {
+  @for $i from 0 through $columns {
+    @include calc-grid-column($i, $class, $type);
+  }
+}
+
+
+// Create grid for specific class
+@mixin make-grid($class) {
+  @include float-grid-columns($class);
+  @include loop-grid-columns($grid-columns, $class, width);
+  @include loop-grid-columns($grid-columns, $class, pull);
+  @include loop-grid-columns($grid-columns, $class, push);
+  @include loop-grid-columns($grid-columns, $class, offset);
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_grid.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_grid.scss
new file mode 100644
index 0000000000..1601f6ab5a
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_grid.scss
@@ -0,0 +1,122 @@
+// Grid system
+//
+// Generate semantic grid columns with these mixins.
+
+// Centered container element
+@mixin container-fixed($gutter: $grid-gutter-width) {
+  margin-right: auto;
+  margin-left: auto;
+  padding-left:  ($gutter / 2);
+  padding-right: ($gutter / 2);
+  @include clearfix();
+}
+
+// Creates a wrapper for a series of columns
+@mixin make-row($gutter: $grid-gutter-width) {
+  margin-left:  ($gutter / -2);
+  margin-right: ($gutter / -2);
+  @include clearfix();
+}
+
+// Generate the extra small columns
+@mixin make-xs-column($columns, $gutter: $grid-gutter-width) {
+  position: relative;
+  float: left;
+  width: percentage(($columns / $grid-columns));
+  min-height: 1px;
+  padding-left:  ($gutter / 2);
+  padding-right: ($gutter / 2);
+}
+@mixin make-xs-column-offset($columns) {
+  margin-left: percentage(($columns / $grid-columns));
+}
+@mixin make-xs-column-push($columns) {
+  left: percentage(($columns / $grid-columns));
+}
+@mixin make-xs-column-pull($columns) {
+  right: percentage(($columns / $grid-columns));
+}
+
+// Generate the small columns
+@mixin make-sm-column($columns, $gutter: $grid-gutter-width) {
+  position: relative;
+  min-height: 1px;
+  padding-left:  ($gutter / 2);
+  padding-right: ($gutter / 2);
+
+  @media (min-width: $screen-sm-min) {
+    float: left;
+    width: percentage(($columns / $grid-columns));
+  }
+}
+@mixin make-sm-column-offset($columns) {
+  @media (min-width: $screen-sm-min) {
+    margin-left: percentage(($columns / $grid-columns));
+  }
+}
+@mixin make-sm-column-push($columns) {
+  @media (min-width: $screen-sm-min) {
+    left: percentage(($columns / $grid-columns));
+  }
+}
+@mixin make-sm-column-pull($columns) {
+  @media (min-width: $screen-sm-min) {
+    right: percentage(($columns / $grid-columns));
+  }
+}
+
+// Generate the medium columns
+@mixin make-md-column($columns, $gutter: $grid-gutter-width) {
+  position: relative;
+  min-height: 1px;
+  padding-left:  ($gutter / 2);
+  padding-right: ($gutter / 2);
+
+  @media (min-width: $screen-md-min) {
+    float: left;
+    width: percentage(($columns / $grid-columns));
+  }
+}
+@mixin make-md-column-offset($columns) {
+  @media (min-width: $screen-md-min) {
+    margin-left: percentage(($columns / $grid-columns));
+  }
+}
+@mixin make-md-column-push($columns) {
+  @media (min-width: $screen-md-min) {
+    left: percentage(($columns / $grid-columns));
+  }
+}
+@mixin make-md-column-pull($columns) {
+  @media (min-width: $screen-md-min) {
+    right: percentage(($columns / $grid-columns));
+  }
+}
+
+// Generate the large columns
+@mixin make-lg-column($columns, $gutter: $grid-gutter-width) {
+  position: relative;
+  min-height: 1px;
+  padding-left:  ($gutter / 2);
+  padding-right: ($gutter / 2);
+
+  @media (min-width: $screen-lg-min) {
+    float: left;
+    width: percentage(($columns / $grid-columns));
+  }
+}
+@mixin make-lg-column-offset($columns) {
+  @media (min-width: $screen-lg-min) {
+    margin-left: percentage(($columns / $grid-columns));
+  }
+}
+@mixin make-lg-column-push($columns) {
+  @media (min-width: $screen-lg-min) {
+    left: percentage(($columns / $grid-columns));
+  }
+}
+@mixin make-lg-column-pull($columns) {
+  @media (min-width: $screen-lg-min) {
+    right: percentage(($columns / $grid-columns));
+  }
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_hide-text.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_hide-text.scss
new file mode 100644
index 0000000000..5e0697218d
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_hide-text.scss
@@ -0,0 +1,21 @@
+// CSS image replacement
+//
+// Heads up! v3 launched with with only `.hide-text()`, but per our pattern for
+// mixins being reused as classes with the same name, this doesn't hold up. As
+// of v3.0.1 we have added `.text-hide()` and deprecated `.hide-text()`.
+//
+// Source: https://github.com/h5bp/html5-boilerplate/commit/aa0396eae757
+
+// Deprecated as of v3.0.1 (will be removed in v4)
+@mixin hide-text() {
+  font: #{0/0} a;
+  color: transparent;
+  text-shadow: none;
+  background-color: transparent;
+  border: 0;
+}
+
+// New mixin to use as of v3.0.1
+@mixin text-hide() {
+  @include hide-text();
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_image.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_image.scss
new file mode 100644
index 0000000000..57d60a32d8
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_image.scss
@@ -0,0 +1,34 @@
+// Image Mixins
+// - Responsive image
+// - Retina image
+
+
+// Responsive image
+//
+// Keep images from scaling beyond the width of their parents.
+@mixin img-responsive($display: block) {
+  display: $display;
+  width: 100% \9; // Force IE10 and below to size SVG images correctly
+  max-width: 100%; // Part 1: Set a maximum relative to the parent
+  height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
+}
+
+
+// Retina image
+//
+// Short retina mixin for setting background-image and -size. Note that the
+// spelling of `min--moz-device-pixel-ratio` is intentional.
+@mixin img-retina($file-1x, $file-2x, $width-1x, $height-1x) {
+  background-image: url(if($bootstrap-sass-asset-helper, twbs-image-path("#{$file-1x}"), "#{$file-1x}"));
+
+  @media
+  only screen and (-webkit-min-device-pixel-ratio: 2),
+  only screen and (   min--moz-device-pixel-ratio: 2),
+  only screen and (     -o-min-device-pixel-ratio: 2/1),
+  only screen and (        min-device-pixel-ratio: 2),
+  only screen and (                min-resolution: 192dpi),
+  only screen and (                min-resolution: 2dppx) {
+    background-image: url(if($bootstrap-sass-asset-helper, twbs-image-path("#{$file-2x}"), "#{$file-2x}"));
+    background-size: $width-1x $height-1x;
+  }
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_labels.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_labels.scss
new file mode 100644
index 0000000000..d99a653370
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_labels.scss
@@ -0,0 +1,12 @@
+// Labels
+
+@mixin label-variant($color) {
+  background-color: $color;
+  
+  &[href] {
+    &:hover,
+    &:focus {
+      background-color: darken($color, 10%);
+    }
+  }
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_list-group.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_list-group.scss
new file mode 100644
index 0000000000..5f05e7ba23
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_list-group.scss
@@ -0,0 +1,31 @@
+// List Groups
+
+@mixin list-group-item-variant($state, $background, $color) {
+  .list-group-item-#{$state} {
+    color: $color;
+    background-color: $background;
+
+    // [converter] extracted a& to a.list-group-item-#{$state}
+  }
+
+  a.list-group-item-#{$state} {
+    color: $color;
+
+    .list-group-item-heading {
+      color: inherit;
+    }
+
+    &:hover,
+    &:focus {
+      color: $color;
+      background-color: darken($background, 5%);
+    }
+    &.active,
+    &.active:hover,
+    &.active:focus {
+      color: #fff;
+      background-color: $color;
+      border-color: $color;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_nav-divider.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_nav-divider.scss
new file mode 100644
index 0000000000..2e6da02a47
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_nav-divider.scss
@@ -0,0 +1,10 @@
+// Horizontal dividers
+//
+// Dividers (basically an hr) within dropdowns and nav lists
+
+@mixin nav-divider($color: #e5e5e5) {
+  height: 1px;
+  margin: (($line-height-computed / 2) - 1) 0;
+  overflow: hidden;
+  background-color: $color;
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_nav-vertical-align.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_nav-vertical-align.scss
new file mode 100644
index 0000000000..c8fbf1a7d6
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_nav-vertical-align.scss
@@ -0,0 +1,9 @@
+// Navbar vertical align
+//
+// Vertically center elements in the navbar.
+// Example: an element has a height of 30px, so write out `.navbar-vertical-align(30px);` to calculate the appropriate top margin.
+
+@mixin navbar-vertical-align($element-height) {
+  margin-top: (($navbar-height - $element-height) / 2);
+  margin-bottom: (($navbar-height - $element-height) / 2);
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_opacity.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_opacity.scss
new file mode 100644
index 0000000000..df088adfe9
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_opacity.scss
@@ -0,0 +1,8 @@
+// Opacity
+
+@mixin opacity($opacity) {
+  opacity: $opacity;
+  // IE8 filter
+  $opacity-ie: ($opacity * 100);
+  filter: #{alpha(opacity=$opacity-ie)};
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_pagination.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_pagination.scss
new file mode 100644
index 0000000000..43fff6863d
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_pagination.scss
@@ -0,0 +1,23 @@
+// Pagination
+
+@mixin pagination-size($padding-vertical, $padding-horizontal, $font-size, $border-radius) {
+  > li {
+    > a,
+    > span {
+      padding: $padding-vertical $padding-horizontal;
+      font-size: $font-size;
+    }
+    &:first-child {
+      > a,
+      > span {
+        @include border-left-radius($border-radius);
+      }
+    }
+    &:last-child {
+      > a,
+      > span {
+        @include border-right-radius($border-radius);
+      }
+    }
+  }
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_panels.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_panels.scss
new file mode 100644
index 0000000000..3ff31ae51e
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_panels.scss
@@ -0,0 +1,24 @@
+// Panels
+
+@mixin panel-variant($border, $heading-text-color, $heading-bg-color, $heading-border) {
+  border-color: $border;
+
+  & > .panel-heading {
+    color: $heading-text-color;
+    background-color: $heading-bg-color;
+    border-color: $heading-border;
+
+    + .panel-collapse > .panel-body {
+      border-top-color: $border;
+    }
+    .badge {
+      color: $heading-bg-color;
+      background-color: $heading-text-color;
+    }
+  }
+  & > .panel-footer {
+    + .panel-collapse > .panel-body {
+      border-bottom-color: $border;
+    }
+  }
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_progress-bar.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_progress-bar.scss
new file mode 100644
index 0000000000..3275ea33d4
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_progress-bar.scss
@@ -0,0 +1,10 @@
+// Progress bars
+
+@mixin progress-bar-variant($color) {
+  background-color: $color;
+
+  // Deprecated parent class requirement as of v3.2.0
+  .progress-striped & {
+    @include gradient-striped();
+  }
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_reset-filter.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_reset-filter.scss
new file mode 100644
index 0000000000..bf73051200
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_reset-filter.scss
@@ -0,0 +1,8 @@
+// Reset filters for IE
+//
+// When you need to remove a gradient background, do not forget to use this to reset
+// the IE filter for IE9 and below.
+
+@mixin reset-filter() {
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_resize.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_resize.scss
new file mode 100644
index 0000000000..83fa637917
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_resize.scss
@@ -0,0 +1,6 @@
+// Resize anything
+
+@mixin resizable($direction) {
+  resize: $direction; // Options: horizontal, vertical, both
+  overflow: auto; // Per CSS3 UI, `resize` only applies when `overflow` isn't `visible`
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_responsive-visibility.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_responsive-visibility.scss
new file mode 100644
index 0000000000..9867db013d
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_responsive-visibility.scss
@@ -0,0 +1,21 @@
+// Responsive utilities
+
+//
+// More easily include all the states for responsive-utilities.less.
+// [converter] $parent hack
+@mixin responsive-visibility($parent) {
+  #{$parent} {
+    display: block !important;
+  }
+  table#{$parent}  { display: table; }
+  tr#{$parent}     { display: table-row !important; }
+  th#{$parent},
+  td#{$parent}     { display: table-cell !important; }
+}
+
+// [converter] $parent hack
+@mixin responsive-invisibility($parent) {
+  #{$parent} {
+    display: none !important;
+  }
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_size.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_size.scss
new file mode 100644
index 0000000000..abbe2463ce
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_size.scss
@@ -0,0 +1,10 @@
+// Sizing shortcuts
+
+@mixin size($width, $height) {
+  width: $width;
+  height: $height;
+}
+
+@mixin square($size) {
+  @include size($size, $size);
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_tab-focus.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_tab-focus.scss
new file mode 100644
index 0000000000..7df0ae7ca1
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_tab-focus.scss
@@ -0,0 +1,9 @@
+// WebKit-style focus
+
+@mixin tab-focus() {
+  // Default
+  outline: thin dotted;
+  // WebKit
+  outline: 5px auto -webkit-focus-ring-color;
+  outline-offset: -2px;
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_table-row.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_table-row.scss
new file mode 100644
index 0000000000..136795081e
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_table-row.scss
@@ -0,0 +1,28 @@
+// Tables
+
+@mixin table-row-variant($state, $background) {
+  // Exact selectors below required to override `.table-striped` and prevent
+  // inheritance to nested tables.
+  .table > thead > tr,
+  .table > tbody > tr,
+  .table > tfoot > tr {
+    > td.#{$state},
+    > th.#{$state},
+    &.#{$state} > td,
+    &.#{$state} > th {
+      background-color: $background;
+    }
+  }
+
+  // Hover states for `.table-hover`
+  // Note: this is not available for cells or rows within `thead` or `tfoot`.
+  .table-hover > tbody > tr {
+    > td.#{$state}:hover,
+    > th.#{$state}:hover,
+    &.#{$state}:hover > td,
+    &:hover > .#{$state},
+    &.#{$state}:hover > th {
+      background-color: darken($background, 5%);
+    }
+  }
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_text-emphasis.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_text-emphasis.scss
new file mode 100644
index 0000000000..1101e03662
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_text-emphasis.scss
@@ -0,0 +1,11 @@
+// Typography
+
+// [converter] $parent hack
+@mixin text-emphasis-variant($parent, $color) {
+  #{$parent} {
+    color: $color;
+  }
+  a#{$parent}:hover {
+    color: darken($color, 10%);
+  }
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_text-overflow.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_text-overflow.scss
new file mode 100644
index 0000000000..1593b25ea5
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_text-overflow.scss
@@ -0,0 +1,8 @@
+// Text overflow
+// Requires inline-block or block for proper styling
+
+@mixin text-overflow() {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/mixins/_vendor-prefixes.scss b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_vendor-prefixes.scss
new file mode 100644
index 0000000000..f91f57686d
--- /dev/null
+++ b/app/assets/stylesheets/rails_admin/bootstrap/mixins/_vendor-prefixes.scss
@@ -0,0 +1,219 @@
+// Vendor Prefixes
+//
+// All vendor mixins are deprecated as of v3.2.0 due to the introduction of
+// Autoprefixer in our Gruntfile. They will be removed in v4.
+
+// - Animations
+// - Backface visibility
+// - Box shadow
+// - Box sizing
+// - Content columns
+// - Hyphens
+// - Placeholder text
+// - Transformations
+// - Transitions
+// - User Select
+
+
+// Animations
+@mixin animation($animation) {
+  -webkit-animation: $animation;
+       -o-animation: $animation;
+          animation: $animation;
+}
+@mixin animation-name($name) {
+  -webkit-animation-name: $name;
+          animation-name: $name;
+}
+@mixin animation-duration($duration) {
+  -webkit-animation-duration: $duration;
+          animation-duration: $duration;
+}
+@mixin animation-timing-function($timing-function) {
+  -webkit-animation-timing-function: $timing-function;
+          animation-timing-function: $timing-function;
+}
+@mixin animation-delay($delay) {
+  -webkit-animation-delay: $delay;
+          animation-delay: $delay;
+}
+@mixin animation-iteration-count($iteration-count) {
+  -webkit-animation-iteration-count: $iteration-count;
+          animation-iteration-count: $iteration-count;
+}
+@mixin animation-direction($direction) {
+  -webkit-animation-direction: $direction;
+          animation-direction: $direction;
+}
+@mixin animation-fill-mode($fill-mode) {
+  -webkit-animation-fill-mode: $fill-mode;
+          animation-fill-mode: $fill-mode;
+}
+
+// Backface visibility
+// Prevent browsers from flickering when using CSS 3D transforms.
+// Default value is `visible`, but can be changed to `hidden`
+
+@mixin backface-visibility($visibility){
+  -webkit-backface-visibility: $visibility;
+     -moz-backface-visibility: $visibility;
+          backface-visibility: $visibility;
+}
+
+// Drop shadows
+//
+// Note: Deprecated `.box-shadow()` as of v3.1.0 since all of Bootstrap's
+// supported browsers that have box shadow capabilities now support it.
+
+@mixin box-shadow($shadow...) {
+  -webkit-box-shadow: $shadow; // iOS <4.3 & Android <4.1
+          box-shadow: $shadow;
+}
+
+// Box sizing
+@mixin box-sizing($boxmodel) {
+  -webkit-box-sizing: $boxmodel;
+     -moz-box-sizing: $boxmodel;
+          box-sizing: $boxmodel;
+}
+
+// CSS3 Content Columns
+@mixin content-columns($column-count, $column-gap: $grid-gutter-width) {
+  -webkit-column-count: $column-count;
+     -moz-column-count: $column-count;
+          column-count: $column-count;
+  -webkit-column-gap: $column-gap;
+     -moz-column-gap: $column-gap;
+          column-gap: $column-gap;
+}
+
+// Optional hyphenation
+@mixin hyphens($mode: auto) {
+  word-wrap: break-word;
+  -webkit-hyphens: $mode;
+     -moz-hyphens: $mode;
+      -ms-hyphens: $mode; // IE10+
+       -o-hyphens: $mode;
+          hyphens: $mode;
+}
+
+// Placeholder text
+@mixin placeholder($color: $input-color-placeholder) {
+  &::-moz-placeholder           { color: $color;   // Firefox
+                                  opacity: 1; } // See https://github.com/twbs/bootstrap/pull/11526
+  &:-ms-input-placeholder       { color: $color; } // Internet Explorer 10+
+  &::-webkit-input-placeholder  { color: $color; } // Safari and Chrome
+}
+
+// Transformations
+@mixin scale($ratio...) {
+  -webkit-transform: scale($ratio);
+      -ms-transform: scale($ratio); // IE9 only
+       -o-transform: scale($ratio);
+          transform: scale($ratio);
+}
+
+@mixin scaleX($ratio) {
+  -webkit-transform: scaleX($ratio);
+      -ms-transform: scaleX($ratio); // IE9 only
+       -o-transform: scaleX($ratio);
+          transform: scaleX($ratio);
+}
+@mixin scaleY($ratio) {
+  -webkit-transform: scaleY($ratio);
+      -ms-transform: scaleY($ratio); // IE9 only
+       -o-transform: scaleY($ratio);
+          transform: scaleY($ratio);
+}
+@mixin skew($x, $y) {
+  -webkit-transform: skewX($x) skewY($y);
+      -ms-transform: skewX($x) skewY($y); // See https://github.com/twbs/bootstrap/issues/4885; IE9+
+       -o-transform: skewX($x) skewY($y);
+          transform: skewX($x) skewY($y);
+}
+@mixin translate($x, $y) {
+  -webkit-transform: translate($x, $y);
+      -ms-transform: translate($x, $y); // IE9 only
+       -o-transform: translate($x, $y);
+          transform: translate($x, $y);
+}
+@mixin translate3d($x, $y, $z) {
+  -webkit-transform: translate3d($x, $y, $z);
+          transform: translate3d($x, $y, $z);
+}
+@mixin rotate($degrees) {
+  -webkit-transform: rotate($degrees);
+      -ms-transform: rotate($degrees); // IE9 only
+       -o-transform: rotate($degrees);
+          transform: rotate($degrees);
+}
+@mixin rotateX($degrees) {
+  -webkit-transform: rotateX($degrees);
+      -ms-transform: rotateX($degrees); // IE9 only
+       -o-transform: rotateX($degrees);
+          transform: rotateX($degrees);
+}
+@mixin rotateY($degrees) {
+  -webkit-transform: rotateY($degrees);
+      -ms-transform: rotateY($degrees); // IE9 only
+       -o-transform: rotateY($degrees);
+          transform: rotateY($degrees);
+}
+@mixin perspective($perspective) {
+  -webkit-perspective: $perspective;
+     -moz-perspective: $perspective;
+          perspective: $perspective;
+}
+@mixin perspective-origin($perspective) {
+  -webkit-perspective-origin: $perspective;
+     -moz-perspective-origin: $perspective;
+          perspective-origin: $perspective;
+}
+@mixin transform-origin($origin) {
+  -webkit-transform-origin: $origin;
+     -moz-transform-origin: $origin;
+      -ms-transform-origin: $origin; // IE9 only
+          transform-origin: $origin;
+}
+
+
+// Transitions
+
+@mixin transition($transition...) {
+  -webkit-transition: $transition;
+       -o-transition: $transition;
+          transition: $transition;
+}
+@mixin transition-property($transition-property...) {
+  -webkit-transition-property: $transition-property;
+          transition-property: $transition-property;
+}
+@mixin transition-delay($transition-delay) {
+  -webkit-transition-delay: $transition-delay;
+          transition-delay: $transition-delay;
+}
+@mixin transition-duration($transition-duration...) {
+  -webkit-transition-duration: $transition-duration;
+          transition-duration: $transition-duration;
+}
+@mixin transition-timing-function($timing-function) {
+  -webkit-transition-timing-function: $timing-function;
+          transition-timing-function: $timing-function;
+}
+@mixin transition-transform($transition...) {
+  -webkit-transition: -webkit-transform $transition;
+     -moz-transition: -moz-transform $transition;
+       -o-transition: -o-transform $transition;
+          transition: transform $transition;
+}
+
+
+// User select
+// For selecting text on the page
+
+@mixin user-select($select) {
+  -webkit-user-select: $select;
+     -moz-user-select: $select;
+      -ms-user-select: $select; // IE10+
+          user-select: $select;
+}
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/responsive.scss b/app/assets/stylesheets/rails_admin/bootstrap/responsive.scss
deleted file mode 100755
index 6ce4643199..0000000000
--- a/app/assets/stylesheets/rails_admin/bootstrap/responsive.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-/*!
- * Bootstrap Responsive v2.3.2
- *
- * Copyright 2012 Twitter, Inc
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Designed and built with all the love in the world @twitter by @mdo and @fat.
- */
-
-
-// Responsive
-// For phone and tablet devices
-// -------------------------------------------------------------
-
-
-// REPEAT VARIABLES & MIXINS
-// -------------------------
-// Required since we compile the responsive stuff separately
-
-@import "rails_admin/bootstrap/variables"; // Modify this for custom colors, font-sizes, etc
-@import "rails_admin/bootstrap/mixins";
-
-
-// RESPONSIVE CLASSES
-// ------------------
-
-@import "rails_admin/bootstrap/responsive-utilities";
-
-
-// MEDIA QUERIES
-// ------------------
-
-// Large desktops
-@import "rails_admin/bootstrap/responsive-1200px-min";
-
-// Tablets to regular desktops
-@import "rails_admin/bootstrap/responsive-768px-979px";
-
-// Phones to portrait tablets and narrow desktops
-@import "rails_admin/bootstrap/responsive-767px-max";
-
-
-// RESPONSIVE NAVBAR
-// ------------------
-
-// From 979px and below, show a button to toggle navbar contents
-@import "rails_admin/bootstrap/responsive-navbar";

From 7d59840fbeeacbe95e3b8b5f13d752f8942fba58 Mon Sep 17 00:00:00 2001
From: Nikolay Moskvin <moskvin@sibext.com>
Date: Thu, 28 Aug 2014 00:28:19 +0700
Subject: [PATCH 07/87] Fixes rails admin css

---
 .../stylesheets/rails_admin/rails_admin.scss.erb      | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/rails_admin/rails_admin.scss.erb b/app/assets/stylesheets/rails_admin/rails_admin.scss.erb
index 595e8f1c9a..a26b3dc4ba 100644
--- a/app/assets/stylesheets/rails_admin/rails_admin.scss.erb
+++ b/app/assets/stylesheets/rails_admin/rails_admin.scss.erb
@@ -48,7 +48,7 @@
 @import "rails_admin/custom/mixins";
 
 /*** Reset ***/
-@import "rails_admin/bootstrap/reset";
+<%# @import "rails_admin/bootstrap/reset"; %>
 /***  Libraries  ***/
 
 @import "rails_admin/aristo/jquery-ui-1.8.7.custom";
@@ -67,7 +67,7 @@
 
 @import "rails_admin/bootstrap/scaffolding";
 @import "rails_admin/bootstrap/grid";
-@import "rails_admin/bootstrap/layouts";
+<%# @import "rails_admin/bootstrap/layouts"; %>
 @import "rails_admin/bootstrap/type";
 @import "rails_admin/bootstrap/forms";
 @import "rails_admin/bootstrap/tables";
@@ -87,11 +87,12 @@
 @import "rails_admin/bootstrap/tooltip";
 @import "rails_admin/bootstrap/popovers";
 @import "rails_admin/bootstrap/thumbnails";
-@import "rails_admin/bootstrap/labels-badges";
+@import "rails_admin/bootstrap/labels";
+@import "rails_admin/bootstrap/badges";
 @import "rails_admin/bootstrap/progress-bars";
-@import "rails_admin/bootstrap/accordion";
+<%# @import "rails_admin/bootstrap/accordion"; %>
 @import "rails_admin/bootstrap/carousel";
-@import "rails_admin/bootstrap/hero-unit";
+<%# @import "rails_admin/bootstrap/hero-unit"; %>
 @import "rails_admin/bootstrap/utilities";
 
 /***  RailsAdmin Theming  ***/

From 61df2471399139a40e1572bd0f659aa18ef9d36a Mon Sep 17 00:00:00 2001
From: Nikolay Moskvin <moskvin@sibext.com>
Date: Thu, 28 Aug 2014 00:47:56 +0700
Subject: [PATCH 08/87] Removed red, blue and black from rails admin css

---
 app/assets/stylesheets/rails_admin/base/theming.scss | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/rails_admin/base/theming.scss b/app/assets/stylesheets/rails_admin/base/theming.scss
index 16de1f363d..0e6700f3d0 100644
--- a/app/assets/stylesheets/rails_admin/base/theming.scss
+++ b/app/assets/stylesheets/rails_admin/base/theming.scss
@@ -15,7 +15,7 @@ body.rails_admin {
   /* Application name */
   .navbar .brand {
     small {
-      color:$red;
+      color:#9d261d;
       font-weight:bold;
       line-height: 1;
     }
@@ -101,7 +101,7 @@ body.rails_admin {
         display:block;
       }
 
-      border-left:5px solid $blue;
+      border-left:5px solid #049cdb;
       padding-left:5px;
       fieldset {
         margin-left:-10px;
@@ -118,7 +118,7 @@ body.rails_admin {
 
     /* double nesting, guys. Easy. */
     .tab-content .tab-content .tab-pane {
-      border-color:lighten($blue, 20%);
+      border-color:lighten(#049cdb, 20%);
       margin-left:10px;
       fieldset {
         margin-left:-20px;
@@ -134,7 +134,7 @@ body.rails_admin {
 
     /* triple nesting!*/
     .tab-content .tab-content .tab-content .tab-pane {
-      border-color:lighten($blue, 30%);
+      border-color:lighten(#049cdb, 30%);
       margin-left:20px;
       fieldset {
         margin-left:-30px;
@@ -150,7 +150,7 @@ body.rails_admin {
 
     /* totally awesome! nesting on 4 levels! */
     .tab-content .tab-content .tab-content  .tab-content .tab-pane {
-      border-color:lighten($blue, 40%);
+      border-color:lighten(#049cdb, 40%);
       margin-left:30px;
       fieldset {
         margin-left:-40px;
@@ -185,7 +185,7 @@ body.rails_admin {
 
   /* tab links should match icon color */
   .nav.nav-tabs li.icon a {
-    color: $black;
+    color: #000;
   }
 
   /* Table cells behaviour */

From 586309ac3a3ebcbcf42d329a9cfa6cab3364d1e6 Mon Sep 17 00:00:00 2001
From: Nikolay Moskvin <moskvin@sibext.com>
Date: Thu, 28 Aug 2014 01:04:21 +0700
Subject: [PATCH 09/87] Try to fix navbar

---
 app/views/layouts/rails_admin/_secondary_navigation.html.haml | 2 +-
 app/views/layouts/rails_admin/application.html.haml           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/rails_admin/_secondary_navigation.html.haml b/app/views/layouts/rails_admin/_secondary_navigation.html.haml
index d7946cf086..6f70299076 100644
--- a/app/views/layouts/rails_admin/_secondary_navigation.html.haml
+++ b/app/views/layouts/rails_admin/_secondary_navigation.html.haml
@@ -1,4 +1,4 @@
-%ul.nav.pull-right.root_links
+%ul.nav.navbar-nav.navbar-right.root_links
   - actions(:root).each do |action|
     %li{class: "#{action.action_name}_root_link"}= link_to wording_for(:menu, action), { action: action.action_name, controller: 'rails_admin/main' }, class: "pjax"
   - if main_app_root_path = (main_app.root_path rescue false)
diff --git a/app/views/layouts/rails_admin/application.html.haml b/app/views/layouts/rails_admin/application.html.haml
index 5885f17d8e..a799103ba2 100644
--- a/app/views/layouts/rails_admin/application.html.haml
+++ b/app/views/layouts/rails_admin/application.html.haml
@@ -11,7 +11,7 @@
       RailsAdmin.I18n.init(JSON.parse("#{j I18n.t("admin.js").to_json}"))
   %body.rails_admin
     #loading.label.label-warning{style: 'display:none; position:fixed; right:20px; bottom:20px; z-index:100000'}= t('admin.loading')
-    .navbar.navbar-fixed-top
+    %nav.navbar.navbar-fixed-top
       = render "layouts/rails_admin/navigation"
     .container-fluid
       .row-fluid

From d787d064570d31d59eb653f646dd47545ad25125 Mon Sep 17 00:00:00 2001
From: Nikolay Moskvin <moskvin@sibext.com>
Date: Thu, 28 Aug 2014 01:14:58 +0700
Subject: [PATCH 10/87] Try to fix sidebar

---
 app/views/layouts/rails_admin/application.html.haml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/layouts/rails_admin/application.html.haml b/app/views/layouts/rails_admin/application.html.haml
index a799103ba2..2e2714926e 100644
--- a/app/views/layouts/rails_admin/application.html.haml
+++ b/app/views/layouts/rails_admin/application.html.haml
@@ -11,14 +11,14 @@
       RailsAdmin.I18n.init(JSON.parse("#{j I18n.t("admin.js").to_json}"))
   %body.rails_admin
     #loading.label.label-warning{style: 'display:none; position:fixed; right:20px; bottom:20px; z-index:100000'}= t('admin.loading')
-    %nav.navbar.navbar-fixed-top
+    %nav.navbar.navbar-default.navbar-fixed-top
       = render "layouts/rails_admin/navigation"
     .container-fluid
-      .row-fluid
-        .span3
+      .row
+        .col-sm-3.col-md-2
           .well.sidebar-nav
             %ul.nav.nav-list= main_navigation
             %ul.nav.nav-list= static_navigation
-        .span9
+        .col-sm-9.col-sm-offset-3.col-md-10.col-md-offset-2
           .row-fluid
             .content{:'data-pjax-container' => true}= render template: 'layouts/rails_admin/pjax'

From ec20b97f67eeb13f378443b9d6bde208fff2e85b Mon Sep 17 00:00:00 2001
From: Nikolay Moskvin <moskvin@sibext.com>
Date: Mon, 1 Sep 2014 11:37:23 +0700
Subject: [PATCH 11/87] Fixed breadcrums and navigation from left

---
 .../stylesheets/rails_admin/base/theming.scss  |  4 +++-
 .../rails_admin/bootstrap/_type.scss           |  2 +-
 app/helpers/rails_admin/application_helper.rb  | 18 ++++++++++--------
 .../layouts/rails_admin/application.html.haml  |  8 ++++----
 app/views/layouts/rails_admin/pjax.html.haml   |  4 ++--
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/app/assets/stylesheets/rails_admin/base/theming.scss b/app/assets/stylesheets/rails_admin/base/theming.scss
index 0e6700f3d0..9030bb5c55 100644
--- a/app/assets/stylesheets/rails_admin/base/theming.scss
+++ b/app/assets/stylesheets/rails_admin/base/theming.scss
@@ -22,7 +22,9 @@ body.rails_admin {
   }
 
   .sidebar-nav {
-    padding: 9px 0;
+    padding: 9px 60px 9px 10px;
+    position: fixed;
+    background: #eaf0f1;
   }
 
   /* fat labels in forms */
diff --git a/app/assets/stylesheets/rails_admin/bootstrap/_type.scss b/app/assets/stylesheets/rails_admin/bootstrap/_type.scss
index 3f21b21085..e31f53b779 100644
--- a/app/assets/stylesheets/rails_admin/bootstrap/_type.scss
+++ b/app/assets/stylesheets/rails_admin/bootstrap/_type.scss
@@ -142,7 +142,7 @@ mark,
 
 .page-header {
   padding-bottom: (($line-height-computed / 2) - 1);
-  margin: ($line-height-computed * 2) 0 $line-height-computed;
+  margin: ($line-height-computed / 2) 0 $line-height-computed;
   border-bottom: 1px solid $page-header-border-color;
 }
 
diff --git a/app/helpers/rails_admin/application_helper.rb b/app/helpers/rails_admin/application_helper.rb
index 92de5b4c7d..75cf47ff4c 100644
--- a/app/helpers/rails_admin/application_helper.rb
+++ b/app/helpers/rails_admin/application_helper.rb
@@ -76,7 +76,7 @@ def main_navigation
 
         label = navigation_label || t('admin.misc.navigation')
 
-        %(<li class='nav-header'>#{capitalize_first_letter label}</li>#{li_stack}) if li_stack.present?
+        %(<li class='dropdown-header'>#{capitalize_first_letter label}</li>#{li_stack}) if li_stack.present?
       end.join.html_safe
     end
 
@@ -96,7 +96,6 @@ def navigation(nodes_stack, nodes, level = 0)
         url         = url_for(action: :index, controller: 'rails_admin/main', model_name: model_param)
         level_class = " nav-level-#{level}" if level > 0
         nav_icon = node.navigation_icon ? %(<i class="#{node.navigation_icon}"></i>).html_safe : ''
-
         li = content_tag :li, 'data-model' => model_param do
           link_to nav_icon + capitalize_first_letter(node.label_plural), url, class: "pjax#{level_class}"
         end
@@ -109,21 +108,24 @@ def breadcrumb(action = @action, _acc = [])
         (parent_actions ||= []) << action
       end while action.breadcrumb_parent && (action = action(*action.breadcrumb_parent)) # rubocop:disable Loop
 
-      content_tag(:ul, class: 'breadcrumb') do
+      content_tag(:ol, class: 'breadcrumb') do
         parent_actions.collect do |a|
           am = a.send(:eval, 'bindings[:abstract_model]')
           o = a.send(:eval, 'bindings[:object]')
           content_tag(:li, class: current_action?(a, am, o) && 'active') do
             crumb = begin
-              if a.http_methods.include?(:get)
-                link_to url_for(action: a.action_name, controller: 'rails_admin/main', model_name: am.try(:to_param), id: (o.try(:persisted?) && o.try(:id) || nil)), class: 'pjax' do
-                  wording_for(:breadcrumb, a, am, o)
+              if not current_action?(a, am, o)
+                if a.http_methods.include?(:get)
+                  link_to url_for(action: a.action_name, controller: 'rails_admin/main', model_name: am.try(:to_param), id: (o.try(:persisted?) && o.try(:id) || nil)), class: 'pjax' do
+                    wording_for(:breadcrumb, a, am, o)
+                  end
+                else
+                  content_tag(:span, wording_for(:breadcrumb, a, am, o))
                 end
               else
-                content_tag(:span, wording_for(:breadcrumb, a, am, o))
+                wording_for(:breadcrumb, a, am, o)
               end
             end
-            crumb += content_tag(:span, '/', class: 'divider') unless current_action?(a, am, o)
             crumb
           end
         end.reverse.join.html_safe
diff --git a/app/views/layouts/rails_admin/application.html.haml b/app/views/layouts/rails_admin/application.html.haml
index 2e2714926e..d0f71f9f51 100644
--- a/app/views/layouts/rails_admin/application.html.haml
+++ b/app/views/layouts/rails_admin/application.html.haml
@@ -16,9 +16,9 @@
     .container-fluid
       .row
         .col-sm-3.col-md-2
-          .well.sidebar-nav
-            %ul.nav.nav-list= main_navigation
-            %ul.nav.nav-list= static_navigation
+          .sidebar-nav
+            %ul.nav.nav-pills.nav-stacked= main_navigation
+            -# %ul.nav.nav-list= static_navigation
         .col-sm-9.col-sm-offset-3.col-md-10.col-md-offset-2
-          .row-fluid
+          .row
             .content{:'data-pjax-container' => true}= render template: 'layouts/rails_admin/pjax'
diff --git a/app/views/layouts/rails_admin/pjax.html.haml b/app/views/layouts/rails_admin/pjax.html.haml
index f253ac61c8..318161fdaf 100644
--- a/app/views/layouts/rails_admin/pjax.html.haml
+++ b/app/views/layouts/rails_admin/pjax.html.haml
@@ -1,6 +1,6 @@
 :javascript
-  $('.nav.nav-list li.active').removeClass('active');
-  $('.nav.nav-list li[data-model="#{@abstract_model.to_param}"]').addClass('active');
+  $('.nav.nav-pills li.active').removeClass('active');
+  $('.nav.nav-pills li[data-model="#{@abstract_model.to_param}"]').addClass('active');
 
 %title= "#{@abstract_model.try(:pretty_name) || @page_name} | #{[_get_plugin_name[0] || 'Rails', _get_plugin_name[1] || 'Admin'].join(' ')}"
 .page-header

From c7590c2c1751809df32bfb8beb1e262367e0bcbf Mon Sep 17 00:00:00 2001
From: Nikolay Moskvin <moskvin@sibext.com>
Date: Mon, 1 Sep 2014 14:21:50 +0700
Subject: [PATCH 12/87] Fixed fields render for form tag

---
 .../rails_admin/ra.filtering-multiselect.js   |  6 ++---
 .../rails_admin/ra.filtering-select.js        |  2 +-
 .../stylesheets/rails_admin/base/theming.scss |  4 +--
 app/helpers/rails_admin/form_builder.rb       |  7 +++---
 .../rails_admin/main/_form_field.html.haml    |  2 +-
 .../rails_admin/main/_form_text.html.haml     |  2 +-
 app/views/rails_admin/main/export.html.haml   | 25 ++++++++++---------
 7 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/app/assets/javascripts/rails_admin/ra.filtering-multiselect.js b/app/assets/javascripts/rails_admin/ra.filtering-multiselect.js
index 115891c992..672de48a83 100644
--- a/app/assets/javascripts/rails_admin/ra.filtering-multiselect.js
+++ b/app/assets/javascripts/rails_admin/ra.filtering-multiselect.js
@@ -48,7 +48,7 @@
 
       this.header = $('<div class="ra-multiselect-header ui-helper-clearfix">');
 
-      this.filter = $('<input type="search" placeholder="' + this.options.regional.search + '" class="ra-multiselect-search"/>');
+      this.filter = $('<input type="search" placeholder="' + this.options.regional.search + '" class="form-control ra-multiselect-search"/>');
 
       this.header.append(this.filter);
 
@@ -68,7 +68,7 @@
 
       this.collection = $('<select multiple="multiple"></select>');
 
-      this.collection.addClass("ra-multiselect-collection");
+      this.collection.addClass("form-control ra-multiselect-collection");
       
       this.addAll = $('<a href="#" class="ra-multiselect-item-add-all"><span class="ui-icon ui-icon-circle-triangle-e"></span>' + this.options.regional.chooseAll + '</a>');
       
@@ -89,7 +89,7 @@
         this.columns.center.append(this.up).append(this.down);
       }
 
-      this.selection = $('<select class="ra-multiselect-selection" multiple="multiple"></select>');
+      this.selection = $('<select class="form-control ra-multiselect-selection" multiple="multiple"></select>');
       
       
 
diff --git a/app/assets/javascripts/rails_admin/ra.filtering-select.js b/app/assets/javascripts/rails_admin/ra.filtering-select.js
index 670fda9f21..463c32cf7e 100644
--- a/app/assets/javascripts/rails_admin/ra.filtering-select.js
+++ b/app/assets/javascripts/rails_admin/ra.filtering-select.js
@@ -42,7 +42,7 @@
       var filtering_select = $('<div class="input-append filtering-select" style="float:left"></div>')
       var input = this.input = $('<input type="text">')
         .val(value)
-        .addClass("ra-filtering-select-input")
+        .addClass("form-control ra-filtering-select-input")
         .attr('style', select.attr('style'))
         .show()
         .autocomplete({
diff --git a/app/assets/stylesheets/rails_admin/base/theming.scss b/app/assets/stylesheets/rails_admin/base/theming.scss
index 9030bb5c55..e9ae25e8d7 100644
--- a/app/assets/stylesheets/rails_admin/base/theming.scss
+++ b/app/assets/stylesheets/rails_admin/base/theming.scss
@@ -60,7 +60,7 @@ body.rails_admin {
         line-height: 16px;
       }
       .help-block {
-        margin-top: 0px;
+        // margin-top: 0px;
       }
       .input-prepend, .input-append {
         margin-bottom: 0px;
@@ -73,7 +73,7 @@ body.rails_admin {
         padding-top:15px;
       }
       .control-label {
-        width:145px;
+        // width:145px;
       }
       legend {
         margin-bottom:0px;
diff --git a/app/helpers/rails_admin/form_builder.rb b/app/helpers/rails_admin/form_builder.rb
index 1b42195dc5..8d195552d0 100644
--- a/app/helpers/rails_admin/form_builder.rb
+++ b/app/helpers/rails_admin/form_builder.rb
@@ -35,7 +35,8 @@ def field_wrapper_for(field, nested_in)
         # do not show nested field if the target is the origin
         unless nested_field_association?(field, nested_in)
           @template.content_tag(:div, class: "control-group #{field.type_css_class} #{field.css_class} #{'error' if field.errors.present?}", id: "#{dom_id(field)}_field") do
-            label(field.method_name, capitalize_first_letter(field.label), class: 'control-label') + (field.nested_form ? field_for(field) : input_for(field))
+            label(field.method_name, capitalize_first_letter(field.label), class: 'col-sm-2 control-label') +
+            (field.nested_form ? field_for(field) : input_for(field))
           end
         end
       else
@@ -44,7 +45,7 @@ def field_wrapper_for(field, nested_in)
     end
 
     def input_for(field)
-      @template.content_tag(:div, class: 'controls') do
+      @template.content_tag(:div, class: 'col-sm-10 controls') do
         field_for(field) +
         errors_for(field) +
         help_for(field)
@@ -56,7 +57,7 @@ def errors_for(field)
     end
 
     def help_for(field)
-      field.help.present? ? @template.content_tag(:p, field.help, class: 'help-block') : ''.html_safe
+      field.help.present? ? @template.content_tag(:span, field.help, class: 'help-block') : ''.html_safe
     end
 
     def field_for(field)
diff --git a/app/views/rails_admin/main/_form_field.html.haml b/app/views/rails_admin/main/_form_field.html.haml
index e3b5249b13..3118b5e42f 100644
--- a/app/views/rails_admin/main/_form_field.html.haml
+++ b/app/views/rails_admin/main/_form_field.html.haml
@@ -1 +1 @@
-= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value, checked: field.form_value.in?([true, '1'])})
+= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value, checked: field.form_value.in?([true, '1']), class: 'form-control'})
diff --git a/app/views/rails_admin/main/_form_text.html.haml b/app/views/rails_admin/main/_form_text.html.haml
index ec636733ef..87ad034532 100644
--- a/app/views/rails_admin/main/_form_text.html.haml
+++ b/app/views/rails_admin/main/_form_text.html.haml
@@ -1 +1 @@
-= form.text_area field.method_name, field.html_attributes.reverse_merge(data: { richtext: false, options: {}.to_json }).reverse_merge({ value: field.form_value })
+= form.text_area field.method_name, field.html_attributes.reverse_merge(data: { richtext: false, options: {}.to_json }).reverse_merge({ value: field.form_value, class: 'form-control' })
diff --git a/app/views/rails_admin/main/export.html.haml b/app/views/rails_admin/main/export.html.haml
index 03495d837d..b675898945 100644
--- a/app/views/rails_admin/main/export.html.haml
+++ b/app/views/rails_admin/main/export.html.haml
@@ -7,15 +7,16 @@
   %fieldset{id: 'fields_to_export'}
     %div.control-group
       %div.controls
-        %label.checkbox{for: 'check_all'}
-          = t('admin.export.select_all_fields')
+        .col-sm-2
+        %label.col-sm-10.checkbox{for: 'check_all'}
           = check_box_tag 'all', 'all', true, { id: 'check_all' }
+          = t('admin.export.select_all_fields')
     %legend
       %i.icon-chevron-down
       = t('admin.export.select')
     .control-group
-      %label.control-label{rel: 'tooltip', :'data-original-title' => t('admin.export.click_to_reverse_selection'), onclick: 'jQuery(this).siblings(".controls").find("input").click()'}= t('admin.export.fields_from', name: @model_config.label_plural.downcase)
-      .controls
+      %label.col-sm-2.control-label{rel: 'tooltip', :'data-original-title' => t('admin.export.click_to_reverse_selection'), onclick: 'jQuery(this).siblings(".controls").find("input").click()'}= t('admin.export.fields_from', name: @model_config.label_plural.downcase)
+      .col-sm-10.controls
         - visible_fields.select{ |f| !f.association? || f.association.polymorphic? }.each do |field|
           - list = field.virtual? ? 'methods' : 'only'
           - if field.association? && field.association.polymorphic?
@@ -34,8 +35,8 @@
     - visible_fields.select{ |f| f.association? && !f.association.polymorphic? }.each do |field|
       - fields = field.associated_model_config.export.with(controller: self.controller, view: self, object: (associated_model = field.associated_model_config.abstract_model.model).new).visible_fields.select{ |f| !f.association? }
       .control-group
-        %label.control-label{rel: 'tooltip', :'data-original-title' => t('admin.export.click_to_reverse_selection'), onclick: 'jQuery(this).siblings(".controls").find("input").click()'}= t('admin.export.fields_from_associated', name: field.label.downcase)
-        .controls
+        %label.col-sm-2.control-label{rel: 'tooltip', :'data-original-title' => t('admin.export.click_to_reverse_selection'), onclick: 'jQuery(this).siblings(".controls").find("input").click()'}= t('admin.export.fields_from_associated', name: field.label.downcase)
+        .col-sm-10.controls
           - fields.each do |associated_model_field|
             - list = associated_model_field.virtual? ? 'methods' : 'only'
             %label.checkbox{for: "schema_include_#{field.name}_#{list}_#{associated_model_field.name}"}
@@ -48,21 +49,21 @@
       = t('admin.export.options_for', name: 'csv')
     .control-group
       - guessed_encoding = @abstract_model.encoding
-      %label.control-label{for: "csv_options_encoding_to"}= t('admin.export.csv.encoding_to')
-      .controls
+      %label.col-sm-2.control-label{for: "csv_options_encoding_to"}= t('admin.export.csv.encoding_to')
+      .col-sm-10.controls
         -# from http://books.google.com/support/partner/bin/answer.py?answer=30990 :
         = select_tag 'csv_options[encoding_to]', options_for_select(RailsAdmin::CSVConverter::TARGET_ENCODINGS), include_blank: true
         %p.help-block= t('admin.export.csv.encoding_to_help', name: guessed_encoding)
 
     .control-group
-      %label.control-label{for: "csv_options_skip_header"}= t('admin.export.csv.skip_header')
-      .controls
+      %label.col-sm-2.control-label{for: "csv_options_skip_header"}= t('admin.export.csv.skip_header')
+      .col-sm-10.controls
         = check_box_tag 'csv_options[skip_header]', 'true'
         %p.help-block= t('admin.export.csv.skip_header_help')
 
     .control-group
-      %label.control-label{for: "csv_options_generator_col_sep"}= t('admin.export.csv.col_sep')
-      .controls
+      %label.col-sm-2.control-label{for: "csv_options_generator_col_sep"}= t('admin.export.csv.col_sep')
+      .col-sm-10.controls
         = select_tag 'csv_options[generator][col_sep]', options_for_select({ '' => t('admin.export.csv.default_col_sep'), "<comma> ','" => ',', "<semicolon> ';'" => ';', '<tabs>' => "'\t'" })
         %p.help-block= t('admin.export.csv.col_sep_help', value: t('admin.export.csv.default_col_sep'))
 

From 03653ce66965d5dbb488f7898182059127bd936d Mon Sep 17 00:00:00 2001
From: Nikolay Moskvin <moskvin@sibext.com>
Date: Mon, 1 Sep 2014 15:15:12 +0700
Subject: [PATCH 13/87] Fixed dshboard and left navigation padding

---
 app/assets/stylesheets/rails_admin/base/theming.scss | 10 ++++++++--
 app/views/layouts/rails_admin/application.html.haml  |  2 +-
 app/views/rails_admin/main/dashboard.html.haml       |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/rails_admin/base/theming.scss b/app/assets/stylesheets/rails_admin/base/theming.scss
index e9ae25e8d7..c99bc7e32b 100644
--- a/app/assets/stylesheets/rails_admin/base/theming.scss
+++ b/app/assets/stylesheets/rails_admin/base/theming.scss
@@ -10,7 +10,11 @@ body.rails_admin {
   }
 
   /* room for upper navbar */
-  padding-top: 60px;
+  padding-top: 43px;
+
+  .reset-left {
+    padding-left: 0px;
+  }
 
   /* Application name */
   .navbar .brand {
@@ -22,8 +26,10 @@ body.rails_admin {
   }
 
   .sidebar-nav {
-    padding: 9px 60px 9px 10px;
+    padding: 9px 9px 9px 9px;
     position: fixed;
+    width: 14%;
+    height: 100%;
     background: #eaf0f1;
   }
 
diff --git a/app/views/layouts/rails_admin/application.html.haml b/app/views/layouts/rails_admin/application.html.haml
index d0f71f9f51..a0b4881eb5 100644
--- a/app/views/layouts/rails_admin/application.html.haml
+++ b/app/views/layouts/rails_admin/application.html.haml
@@ -15,7 +15,7 @@
       = render "layouts/rails_admin/navigation"
     .container-fluid
       .row
-        .col-sm-3.col-md-2
+        .col-sm-3.col-md-2.reset-left
           .sidebar-nav
             %ul.nav.nav-pills.nav-stacked= main_navigation
             -# %ul.nav.nav-list= static_navigation
diff --git a/app/views/rails_admin/main/dashboard.html.haml b/app/views/rails_admin/main/dashboard.html.haml
index c156a4b0e6..46f88f41f7 100644
--- a/app/views/rails_admin/main/dashboard.html.haml
+++ b/app/views/rails_admin/main/dashboard.html.haml
@@ -24,7 +24,7 @@
               - count = @count[abstract_model.pretty_name]
               - percent = count > 0 ? (@max <= 1 ? count : ((Math.log(count+1) * 100.0) / Math.log(@max+1)).to_i) : -1
               .progress{style: "margin-bottom:0px", class: "progress-#{get_indicator(percent)} #{active && 'active progress-striped'}"  }
-                .bar.animate-width-to{:'data-animate-length' => ([1.0, percent].max.to_i * 20), :'data-animate-width-to' => "#{[2.0, percent].max.to_i}%", style: "width:2%"}
+                .progress-bar.animate-width-to{:class => "progress-bar-#{get_indicator(percent)}", :'data-animate-length' => ([1.0, percent].max.to_i * 20), :'data-animate-width-to' => "#{[2.0, percent].max.to_i}%", style: "width:2%"}
                   = @count[abstract_model.pretty_name]
             %td.links
               %ul.inline= menu_for :collection, abstract_model, nil, true

From a99205b3f05c70df756bf021b8e78c99144a5752 Mon Sep 17 00:00:00 2001
From: Nikolay Moskvin <moskvin@sibext.com>
Date: Tue, 2 Sep 2014 15:56:18 +0700
Subject: [PATCH 14/87] Added count to each model as badge

---
 app/helpers/rails_admin/application_helper.rb       | 4 +++-
 app/views/layouts/rails_admin/application.html.haml | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/helpers/rails_admin/application_helper.rb b/app/helpers/rails_admin/application_helper.rb
index 75cf47ff4c..e05d952070 100644
--- a/app/helpers/rails_admin/application_helper.rb
+++ b/app/helpers/rails_admin/application_helper.rb
@@ -96,8 +96,10 @@ def navigation(nodes_stack, nodes, level = 0)
         url         = url_for(action: :index, controller: 'rails_admin/main', model_name: model_param)
         level_class = " nav-level-#{level}" if level > 0
         nav_icon = node.navigation_icon ? %(<i class="#{node.navigation_icon}"></i>).html_safe : ''
+        count = node.abstract_model.count
+        badge = %( <span class='badge'>#{count}</span>).html_safe
         li = content_tag :li, 'data-model' => model_param do
-          link_to nav_icon + capitalize_first_letter(node.label_plural), url, class: "pjax#{level_class}"
+          link_to badge + nav_icon + capitalize_first_letter(node.label_plural), url, class: "pjax#{level_class}"
         end
         li + navigation(nodes_stack, nodes_stack.select { |n| n.parent.to_s == node.abstract_model.model_name }, level + 1)
       end.join.html_safe
diff --git a/app/views/layouts/rails_admin/application.html.haml b/app/views/layouts/rails_admin/application.html.haml
index a0b4881eb5..8df379e668 100644
--- a/app/views/layouts/rails_admin/application.html.haml
+++ b/app/views/layouts/rails_admin/application.html.haml
@@ -18,7 +18,7 @@
         .col-sm-3.col-md-2.reset-left
           .sidebar-nav
             %ul.nav.nav-pills.nav-stacked= main_navigation
-            -# %ul.nav.nav-list= static_navigation
+            %ul.nav.nav-pills.nav-stacked= static_navigation
         .col-sm-9.col-sm-offset-3.col-md-10.col-md-offset-2
           .row
             .content{:'data-pjax-container' => true}= render template: 'layouts/rails_admin/pjax'

From 3204ad5058963c5fa82ab9dd51907ba00f8f731b Mon Sep 17 00:00:00 2001
From: Nikolay Moskvin <moskvin@sibext.com>
Date: Tue, 2 Sep 2014 16:29:47 +0700
Subject: [PATCH 15/87] Fixed view of paginator

---
 app/helpers/rails_admin/application_helper.rb   |  2 +-
 .../twitter-bootstrap/_paginator.html.haml      | 17 ++++++++---------
 app/views/rails_admin/main/index.html.haml      |  6 ++++--
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/app/helpers/rails_admin/application_helper.rb b/app/helpers/rails_admin/application_helper.rb
index e05d952070..8f93242f49 100644
--- a/app/helpers/rails_admin/application_helper.rb
+++ b/app/helpers/rails_admin/application_helper.rb
@@ -97,7 +97,7 @@ def navigation(nodes_stack, nodes, level = 0)
         level_class = " nav-level-#{level}" if level > 0
         nav_icon = node.navigation_icon ? %(<i class="#{node.navigation_icon}"></i>).html_safe : ''
         count = node.abstract_model.count
-        badge = %( <span class='badge'>#{count}</span>).html_safe
+        badge = %( <span class='badge pull-right'>#{count}</span>).html_safe
         li = content_tag :li, 'data-model' => model_param do
           link_to badge + nav_icon + capitalize_first_letter(node.label_plural), url, class: "pjax#{level_class}"
         end
diff --git a/app/views/kaminari/twitter-bootstrap/_paginator.html.haml b/app/views/kaminari/twitter-bootstrap/_paginator.html.haml
index bdd9b4b8da..47f2b27e95 100644
--- a/app/views/kaminari/twitter-bootstrap/_paginator.html.haml
+++ b/app/views/kaminari/twitter-bootstrap/_paginator.html.haml
@@ -1,10 +1,9 @@
 = paginator.render do
-  .pagination
-    %ul
-      = prev_page_tag
-      - each_page do |page|
-        - if page.left_outer? or page.right_outer? or page.inside_window?
-          = page_tag page
-        - elsif !page.was_truncated?
-          = gap_tag
-      = next_page_tag
+  %ul.pagination
+    = prev_page_tag
+    - each_page do |page|
+      - if page.left_outer? or page.right_outer? or page.inside_window?
+        = page_tag page
+      - elsif !page.was_truncated?
+        = gap_tag
+    = next_page_tag
diff --git a/app/views/rails_admin/main/index.html.haml b/app/views/rails_admin/main/index.html.haml
index 155bfd7325..5e544cdb42 100644
--- a/app/views/rails_admin/main/index.html.haml
+++ b/app/views/rails_admin/main/index.html.haml
@@ -146,8 +146,10 @@
               %ul.inline= menu_for :member, @abstract_model, object, true
     - if @objects.respond_to?(:total_count)
       - total_count = @objects.total_count.to_i
-      = paginate(@objects, theme: 'twitter-bootstrap', remote: true)
-      = link_to(t("admin.misc.show_all"), index_path(params.merge(all: true)), class: "show-all btn clearfix pjax") unless total_count > 100 || total_count <= @objects.to_a.size
+      .row
+        .col-md-6= paginate(@objects, theme: 'twitter-bootstrap', remote: true)
+      .row
+        .col-md-6= link_to(t("admin.misc.show_all"), index_path(params.merge(all: true)), class: "show-all btn btn-default clearfix pjax") unless total_count > 100 || total_count <= @objects.to_a.size
       .clearfix.total-count= "#{total_count} #{@model_config.pluralize(total_count).downcase}"
     - else
       .clearfix.total-count= "#{@objects.size} #{@model_config.pluralize(@objects.size).downcase}"

From fe9a1ee8185f02c321cd5a1c4bf8cacb1473a132 Mon Sep 17 00:00:00 2001
From: Nikolay Moskvin <moskvin@sibext.com>
Date: Sun, 7 Sep 2014 20:36:27 +0700
Subject: [PATCH 16/87] Fixed css class for filter field

---
 app/views/rails_admin/main/index.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/rails_admin/main/index.html.haml b/app/views/rails_admin/main/index.html.haml
index 5e544cdb42..a7eed17ded 100644
--- a/app/views/rails_admin/main/index.html.haml
+++ b/app/views/rails_admin/main/index.html.haml
@@ -96,7 +96,7 @@
     .well
       %span#filters_box
       %hr.filters_box{style: "display:#{@ordered_filters.empty? ? 'none' : 'block'}"}
-      %input.input-small{name: "query", type: "search", value: query, placeholder: t("admin.misc.filter")}
+      %input.form-control.input-small{name: "query", type: "search", value: query, placeholder: t("admin.misc.filter")}
       %button.btn.btn-primary{type: "submit", :'data-disable-with' => "<i class='icon-white icon-refresh'></i> ".html_safe + t("admin.misc.refresh")}
         %i.icon-white.icon-refresh
         = t("admin.misc.refresh")

From 5c15b79c5d11b9aba757714857132803e8bb1478 Mon Sep 17 00:00:00 2001
From: Nikolay Moskvin <moskvin@sibext.com>
Date: Sun, 7 Sep 2014 20:53:32 +0700
Subject: [PATCH 17/87] Fixed double line for table heading

---
 app/assets/stylesheets/rails_admin/base/theming.scss | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/app/assets/stylesheets/rails_admin/base/theming.scss b/app/assets/stylesheets/rails_admin/base/theming.scss
index c99bc7e32b..ea2f87ade7 100644
--- a/app/assets/stylesheets/rails_admin/base/theming.scss
+++ b/app/assets/stylesheets/rails_admin/base/theming.scss
@@ -198,6 +198,16 @@ body.rails_admin {
 
   /* Table cells behaviour */
   .table {
+    // Cells
+    > thead,
+    > tbody,
+    > tfoot {
+      > tr {
+        > th {
+          border-bottom: 0px;
+        }
+      }
+    }
     .thumbnail {
       float:left;
       & + * {

From 462c7fdc80339ef7e40cad823f8b96de4301459f Mon Sep 17 00:00:00 2001
From: Nikolay Moskvin <moskvin@sibext.com>
Date: Mon, 8 Sep 2014 23:19:10 +0700
Subject: [PATCH 18/87] Fixed bootstrap modal popups

---
 app/assets/javascripts/rails_admin/ra.remote-form.js | 6 +++++-
 app/assets/stylesheets/rails_admin/base/theming.scss | 8 ++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/rails_admin/ra.remote-form.js b/app/assets/javascripts/rails_admin/ra.remote-form.js
index 7d8c33909d..6f2b1bcd59 100644
--- a/app/assets/javascripts/rails_admin/ra.remote-form.js
+++ b/app/assets/javascripts/rails_admin/ra.remote-form.js
@@ -123,6 +123,8 @@
       var widget = this;
       if (!widget.dialog) {
         widget.dialog = $('<div id="modal" class="modal fade">\
+            <div class="modal-dialog">\
+            <div class="modal-content">\
             <div class="modal-header">\
               <a href="#" class="close" data-dismiss="modal">&times;</a>\
               <h3 class="modal-header-title">...</h3>\
@@ -134,13 +136,15 @@
               <a href="#" class="btn cancel-action">...</a>\
               <a href="#" class="btn btn-primary save-action">...</a>\
             </div>\
+            </div>\
+            </div>\
           </div>')
           .modal({
             keyboard: true,
             backdrop: true,
             show: true
           })
-          .on('hidden', function(){
+          .on('hidden.bs.modal', function(){
             widget.dialog.remove();   // We don't want to reuse closed modals
             widget.dialog = null;
           });
diff --git a/app/assets/stylesheets/rails_admin/base/theming.scss b/app/assets/stylesheets/rails_admin/base/theming.scss
index ea2f87ade7..b50d4324fe 100644
--- a/app/assets/stylesheets/rails_admin/base/theming.scss
+++ b/app/assets/stylesheets/rails_admin/base/theming.scss
@@ -173,10 +173,10 @@ body.rails_admin {
     }
   }
 
-  .modal {
-    width: 750px;
-    margin-left: -375px;
-  }
+  // .modal {
+  //   width: 750px;
+  //   margin-left: -375px;
+  // }
 
   /* nested nav */
   .nav.nav-list {

From 09d2010de0d1f1783cb6f799b611b1f50baa94fe Mon Sep 17 00:00:00 2001
From: Nikolay Moskvin <moskvin@sibext.com>
Date: Tue, 9 Sep 2014 00:22:59 +0700
Subject: [PATCH 19/87] Fixed bootstrap paddings for action buttons and filter
 action was improved

---
 .../stylesheets/rails_admin/rails_admin.scss.erb       |  3 +++
 app/views/rails_admin/main/_submit_buttons.html.haml   |  1 +
 app/views/rails_admin/main/export.html.haml            |  1 +
 app/views/rails_admin/main/index.html.haml             | 10 ++++++----
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/assets/stylesheets/rails_admin/rails_admin.scss.erb b/app/assets/stylesheets/rails_admin/rails_admin.scss.erb
index a26b3dc4ba..4169be2f08 100644
--- a/app/assets/stylesheets/rails_admin/rails_admin.scss.erb
+++ b/app/assets/stylesheets/rails_admin/rails_admin.scss.erb
@@ -65,6 +65,7 @@
 
 /***  Bootstrap Theming  ***/
 
+@import "rails_admin/bootstrap/normalize";
 @import "rails_admin/bootstrap/scaffolding";
 @import "rails_admin/bootstrap/grid";
 <%# @import "rails_admin/bootstrap/layouts"; %>
@@ -77,6 +78,7 @@
 @import "rails_admin/bootstrap/close";
 @import "rails_admin/bootstrap/buttons";
 @import "rails_admin/bootstrap/button-groups";
+@import "rails_admin/bootstrap/input-groups";
 @import "rails_admin/bootstrap/alerts";
 @import "rails_admin/bootstrap/navs";
 @import "rails_admin/bootstrap/navbar";
@@ -94,6 +96,7 @@
 @import "rails_admin/bootstrap/carousel";
 <%# @import "rails_admin/bootstrap/hero-unit"; %>
 @import "rails_admin/bootstrap/utilities";
+@import "rails_admin/bootstrap/responsive-utilities";
 
 /***  RailsAdmin Theming  ***/
 
diff --git a/app/views/rails_admin/main/_submit_buttons.html.haml b/app/views/rails_admin/main/_submit_buttons.html.haml
index 59f44d10a2..c9ed3eff09 100644
--- a/app/views/rails_admin/main/_submit_buttons.html.haml
+++ b/app/views/rails_admin/main/_submit_buttons.html.haml
@@ -1,4 +1,5 @@
 %input{type: :hidden, name: 'return_to', value: (params[:return_to].presence || request.referer)}
+%br
 .form-actions
   %button.btn.btn-primary{type: "submit", name: "_save", :'data-disable-with' => t("admin.form.save")}
     %i.icon-white.icon-ok
diff --git a/app/views/rails_admin/main/export.html.haml b/app/views/rails_admin/main/export.html.haml
index b675898945..358e9378d3 100644
--- a/app/views/rails_admin/main/export.html.haml
+++ b/app/views/rails_admin/main/export.html.haml
@@ -67,6 +67,7 @@
         = select_tag 'csv_options[generator][col_sep]', options_for_select({ '' => t('admin.export.csv.default_col_sep'), "<comma> ','" => ',', "<semicolon> ';'" => ';', '<tabs>' => "'\t'" })
         %p.help-block= t('admin.export.csv.col_sep_help', value: t('admin.export.csv.default_col_sep'))
 
+  %br
   .form-actions
     %input{type: :hidden, name: 'return_to', value: (params[:return_to].presence || request.referer)}
     %button.btn.btn-primary{type: "submit", name: 'csv'}
diff --git a/app/views/rails_admin/main/index.html.haml b/app/views/rails_admin/main/index.html.haml
index a7eed17ded..61780881d3 100644
--- a/app/views/rails_admin/main/index.html.haml
+++ b/app/views/rails_admin/main/index.html.haml
@@ -96,10 +96,12 @@
     .well
       %span#filters_box
       %hr.filters_box{style: "display:#{@ordered_filters.empty? ? 'none' : 'block'}"}
-      %input.form-control.input-small{name: "query", type: "search", value: query, placeholder: t("admin.misc.filter")}
-      %button.btn.btn-primary{type: "submit", :'data-disable-with' => "<i class='icon-white icon-refresh'></i> ".html_safe + t("admin.misc.refresh")}
-        %i.icon-white.icon-refresh
-        = t("admin.misc.refresh")
+      .input-group
+        %input.form-control.input-small{name: "query", type: "search", value: query, placeholder: t("admin.misc.filter")}
+        %span.input-group-btn
+          %button.btn.btn-primary{type: "submit", :'data-disable-with' => "<i class='icon-white icon-refresh'></i> ".html_safe + t("admin.misc.refresh")}
+            %i.icon-white.icon-refresh
+            = t("admin.misc.refresh")
       - if export_action
         %span{style: 'float:right'}= link_to wording_for(:link, export_action), export_path(params.except('set').except('page')), class: 'btn btn-info'
 

From 328ff6d37e558bf6ec09336ad5544206bab9954f Mon Sep 17 00:00:00 2001
From: Nikolay Moskvin <moskvin@sibext.com>
Date: Mon, 29 Sep 2014 21:55:40 +0700
Subject: [PATCH 20/87] Changed prepend to append for multi-selectors

---
 app/assets/javascripts/rails_admin/ra.remote-form.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/rails_admin/ra.remote-form.js b/app/assets/javascripts/rails_admin/ra.remote-form.js
index 6f2b1bcd59..bce814c3cf 100644
--- a/app/assets/javascripts/rails_admin/ra.remote-form.js
+++ b/app/assets/javascripts/rails_admin/ra.remote-form.js
@@ -110,7 +110,7 @@
               multiselect.find('option[value= ' + json.id + ']').text(json.label);
             } else { // add
               select.prepend(option);
-              multiselect.find('select.ra-multiselect-selection').prepend(option);
+              multiselect.find('select.ra-multiselect-selection').append(option);
             }
           }
           widget._trigger("success");

From bf8b84fdd577e8e1ca42c7bc280cead055f63887 Mon Sep 17 00:00:00 2001
From: Nikolay Moskvin <moskvin@sibext.com>
Date: Mon, 29 Sep 2014 23:57:03 +0700
Subject: [PATCH 21/87] Fixed error message for bootstrap 3

---
 app/helpers/rails_admin/form_builder.rb      | 6 ++++--
 app/views/layouts/rails_admin/pjax.html.haml | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/helpers/rails_admin/form_builder.rb b/app/helpers/rails_admin/form_builder.rb
index 8d195552d0..84456dae2e 100644
--- a/app/helpers/rails_admin/form_builder.rb
+++ b/app/helpers/rails_admin/form_builder.rb
@@ -45,7 +45,9 @@ def field_wrapper_for(field, nested_in)
     end
 
     def input_for(field)
-      @template.content_tag(:div, class: 'col-sm-10 controls') do
+      css = 'col-sm-10 controls'
+      css += ' has-error' if field.errors.present?
+      @template.content_tag(:div, class: css) do
         field_for(field) +
         errors_for(field) +
         help_for(field)
@@ -53,7 +55,7 @@ def input_for(field)
     end
 
     def errors_for(field)
-      field.errors.present? ? @template.content_tag(:span, field.errors.to_sentence, class: 'help-inline') : ''.html_safe
+      field.errors.present? ? @template.content_tag(:span, field.errors.to_sentence, class: 'help-inline text-danger') : ''.html_safe
     end
 
     def help_for(field)
diff --git a/app/views/layouts/rails_admin/pjax.html.haml b/app/views/layouts/rails_admin/pjax.html.haml
index 318161fdaf..51310a2ee5 100644
--- a/app/views/layouts/rails_admin/pjax.html.haml
+++ b/app/views/layouts/rails_admin/pjax.html.haml
@@ -6,6 +6,7 @@
 .page-header
   %h1= @page_name
 - flash && flash.each do |key, value|
+  - key = 'danger' if key == 'error'
   .alert{class: "alert-#{key}"}
     %a.close{href: '#', :'data-dismiss' => "alert"} &times;
     = value

From 042cb661121d4207768659b54c98ac58f66457e4 Mon Sep 17 00:00:00 2001
From: Nikolay Moskvin <moskvin@sibext.com>
Date: Fri, 3 Oct 2014 14:35:58 +0700
Subject: [PATCH 22/87] Fixed form layouts

---
 app/helpers/rails_admin/form_builder.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/rails_admin/form_builder.rb b/app/helpers/rails_admin/form_builder.rb
index 84456dae2e..48fa840d8a 100644
--- a/app/helpers/rails_admin/form_builder.rb
+++ b/app/helpers/rails_admin/form_builder.rb
@@ -34,7 +34,7 @@ def field_wrapper_for(field, nested_in)
       if field.label
         # do not show nested field if the target is the origin
         unless nested_field_association?(field, nested_in)
-          @template.content_tag(:div, class: "control-group #{field.type_css_class} #{field.css_class} #{'error' if field.errors.present?}", id: "#{dom_id(field)}_field") do
+          @template.content_tag(:div, class: "form-group control-group #{field.type_css_class} #{field.css_class} #{'error' if field.errors.present?}", id: "#{dom_id(field)}_field") do
             label(field.method_name, capitalize_first_letter(field.label), class: 'col-sm-2 control-label') +
             (field.nested_form ? field_for(field) : input_for(field))
           end

From ff5708ef56980e8a7817cdf87e5e91cf4994d07a Mon Sep 17 00:00:00 2001
From: Nikolay Moskvin <moskvin@sibext.com>
Date: Tue, 7 Oct 2014 11:36:29 +0700
Subject: [PATCH 23/87] Fixed style and z-index for datetimepicker

---
 .../rails_admin/ra.calendar-additions.scss      | 17 +++++++++++++++++
 .../rails_admin/main/_form_datetime.html.haml   |  3 ++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/rails_admin/ra.calendar-additions.scss b/app/assets/stylesheets/rails_admin/ra.calendar-additions.scss
index f4f30168f4..7cd71b3f95 100644
--- a/app/assets/stylesheets/rails_admin/ra.calendar-additions.scss
+++ b/app/assets/stylesheets/rails_admin/ra.calendar-additions.scss
@@ -25,3 +25,20 @@
     }
   }
 }
+/* span for disabled cells */
+.ui-timepicker-table td span {
+    width: auto;
+}
+/* anchors for clickable cells */
+.ui-timepicker-table td a {
+    width: auto;
+}
+.input-group {
+  .hasTimepicker {
+    @extend .form-control;
+    width: 65px !important;
+  }
+  .hasDatepicker {
+    @extend .form-control
+  }
+}
diff --git a/app/views/rails_admin/main/_form_datetime.html.haml b/app/views/rails_admin/main/_form_datetime.html.haml
index 272ca7afd3..ae3baee032 100644
--- a/app/views/rails_admin/main/_form_datetime.html.haml
+++ b/app/views/rails_admin/main/_form_datetime.html.haml
@@ -1 +1,2 @@
-= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value }).reverse_merge({ data: { datetimepicker: true, options: field.js_plugin_options.to_json } })
+.input-group
+  = form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value }).reverse_merge({ data: { datetimepicker: true, options: field.js_plugin_options.to_json } })

From 0fc5434ae3cfc32168ba1840a16225d6dc29c178 Mon Sep 17 00:00:00 2001
From: Nikolay Moskvin <moskvin@sibext.com>
Date: Thu, 23 Oct 2014 22:36:42 +0700
Subject: [PATCH 24/87] Fixed navigation partial for bootstrap 3

---
 app/views/layouts/rails_admin/_navigation.html.haml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/layouts/rails_admin/_navigation.html.haml b/app/views/layouts/rails_admin/_navigation.html.haml
index 409e639a2b..74c3accd5e 100644
--- a/app/views/layouts/rails_admin/_navigation.html.haml
+++ b/app/views/layouts/rails_admin/_navigation.html.haml
@@ -1,7 +1,7 @@
-.navbar-inner
-  .container-fluid
-    %a.brand.pjax{href: dashboard_path}
+.container-fluid
+  .navbar-header
+    %a.navbar-brand.pjax{href: dashboard_path}
       = _get_plugin_name[0] || 'Rails'
       %small= _get_plugin_name[1] || 'Admin'
-    .nav-collapse
-      = render partial: 'layouts/rails_admin/secondary_navigation'
\ No newline at end of file
+  .collapse.navbar-collapse
+    = render partial: 'layouts/rails_admin/secondary_navigation'

From 312e53dfd86d7f381ca56b58999faa6be9789eb5 Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Fri, 24 Oct 2014 17:43:35 +0900
Subject: [PATCH 25/87] Virtual fields caused #show to crash. Closes #1767

---
 app/views/rails_admin/main/show.html.haml     |  2 +-
 lib/rails_admin/config/fields/base.rb         |  9 +++
 .../fields/types/polymorphic_association.rb   |  4 ++
 .../show/rails_admin_config_show_spec.rb      | 68 ++++++++++++++++---
 4 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/app/views/rails_admin/main/show.html.haml b/app/views/rails_admin/main/show.html.haml
index 8eac12492f..73e55f0a42 100644
--- a/app/views/rails_admin/main/show.html.haml
+++ b/app/views/rails_admin/main/show.html.haml
@@ -1,6 +1,6 @@
 - @model_config.show.with(object: @object, view: self, controller: self.controller).visible_groups.each do |fieldset|
   - unless (fields = fieldset.with(object: @object, view: self, controller: self.controller).visible_fields).empty?
-    - if !(values = fields.map{ |f| f.value.presence }).compact.empty? || !RailsAdmin::config.compact_show_view
+    - if !(values = fields.map{ |f| f.formatted_value.presence }).compact.empty? || !RailsAdmin::config.compact_show_view
       .fieldset
         %h4
           = fieldset.label
diff --git a/lib/rails_admin/config/fields/base.rb b/lib/rails_admin/config/fields/base.rb
index 91c5484e9a..6cb352fa82 100644
--- a/lib/rails_admin/config/fields/base.rb
+++ b/lib/rails_admin/config/fields/base.rb
@@ -266,6 +266,15 @@ def type
         # Reader for field's value
         def value
           bindings[:object].safe_send(name)
+        rescue NoMethodError => e
+          raise e.exception <<-EOM.gsub(/^\s{10}/, '')
+          #{e.message}
+          If you want to use a RailsAdmin virtual field(= a field without corresponding instance method),
+          you should declare 'formatted_value' in the field definition.
+            field :#{name} do
+              formatted_value{ bindings[:object].call_some_method }
+            end
+          EOM
         end
 
         # Reader for nested attributes
diff --git a/lib/rails_admin/config/fields/types/polymorphic_association.rb b/lib/rails_admin/config/fields/types/polymorphic_association.rb
index be68b7e347..9e68004ae3 100644
--- a/lib/rails_admin/config/fields/types/polymorphic_association.rb
+++ b/lib/rails_admin/config/fields/types/polymorphic_association.rb
@@ -19,6 +19,10 @@ class PolymorphicAssociation < RailsAdmin::Config::Fields::Types::BelongsToAssoc
             associated_model_config.length > 0
           end
 
+          register_instance_option :formatted_value do
+            (o = value) && o.send(RailsAdmin.config(o).object_label_method)
+          end
+
           register_instance_option :sortable do
             false
           end
diff --git a/spec/integration/config/show/rails_admin_config_show_spec.rb b/spec/integration/config/show/rails_admin_config_show_spec.rb
index 0b1c9f8852..f51162bb98 100644
--- a/spec/integration/config/show/rails_admin_config_show_spec.rb
+++ b/spec/integration/config/show/rails_admin_config_show_spec.rb
@@ -5,11 +5,6 @@
   let(:team) { FactoryGirl.create :team }
 
   def do_request
-    # tests were done with compact_show_view being false
-    RailsAdmin.config do |c|
-      c.compact_show_view = false
-    end
-
     visit show_path(model_name: 'team', id: team.id)
   end
 
@@ -34,9 +29,8 @@ def do_request
   describe 'compact_show_view' do
 
     it 'hides empty fields in show view by default' do
-      @player = FactoryGirl.create :player
-      visit show_path(model_name: 'league', id: @player.id)
-      is_expected.not_to have_css('.born_on_field')
+      do_request
+      is_expected.not_to have_css('.logo_url_field')
     end
 
     it 'is disactivable' do
@@ -44,9 +38,8 @@ def do_request
         c.compact_show_view = false
       end
 
-      @player = FactoryGirl.create :player
-      visit show_path(model_name: 'player', id: @player.id)
-      is_expected.to have_css('.born_on_field')
+      do_request
+      is_expected.to have_css('.logo_url_field')
     end
   end
 
@@ -77,6 +70,12 @@ def do_request
   end
 
   describe 'field groupings' do
+    before do
+      RailsAdmin.config do |c|
+        c.compact_show_view = false
+      end
+    end
+
     it 'is hideable' do
       RailsAdmin.config Team do
         show do
@@ -179,6 +178,11 @@ def do_request
   end
 
   describe "items' fields" do
+    before do
+      RailsAdmin.config do |c|
+        c.compact_show_view = false
+      end
+    end
 
     it 'shows all by default' do
       do_request
@@ -344,4 +348,46 @@ def do_request
       is_expected.not_to have_link('embed 1')
     end
   end
+
+  describe 'virtual field' do
+    let(:team) { FactoryGirl.create :team, name: 'foobar' }
+    context 'with formatted_value defined' do
+      before do
+        RailsAdmin.config Team do
+          show do
+            field :truncated_name do
+              formatted_value do
+                bindings[:object].name.truncate(5)
+              end
+            end
+          end
+        end
+      end
+
+      it 'shows up correctly' do
+        do_request
+
+        is_expected.to have_selector('.truncated_name_field')
+        is_expected.to have_selector('dd', text: 'fo...')
+      end
+    end
+
+    context 'without formatted_value' do
+      before do
+        RailsAdmin.config Team do
+          show do
+            field :truncated_name do
+              pretty_value do
+                bindings[:object].name.truncate(5)
+              end
+            end
+          end
+        end
+      end
+
+      it 'raises error along with suggestion' do
+        expect { do_request }.to raise_error(/you should declare 'formatted_value'/)
+      end
+    end
+  end
 end

From f2ea475cee055fa186a063e2fc0b8254123f229a Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Fri, 31 Oct 2014 11:23:48 +0900
Subject: [PATCH 26/87] Fix spec failures brought by #2059

---
 .../rails_admin/application_helper_spec.rb       | 14 +++++++-------
 .../basic/list/rails_admin_basic_list_spec.rb    | 16 ++++++++--------
 spec/integration/rails_admin_spec.rb             |  2 +-
 spec/orm/active_record.rb                        |  8 ++++++++
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/spec/helpers/rails_admin/application_helper_spec.rb b/spec/helpers/rails_admin/application_helper_spec.rb
index 0142086554..f09e152270 100644
--- a/spec/helpers/rails_admin/application_helper_spec.rb
+++ b/spec/helpers/rails_admin/application_helper_spec.rb
@@ -208,7 +208,7 @@ def initialize(_user)
         RailsAdmin.config do |config|
           config.included_models = [Ball, Comment]
         end
-        expect(helper.main_navigation).to match(/(nav\-header).*(Navigation).*(Balls).*(Comments)/m)
+        expect(helper.main_navigation).to match(/(dropdown-header).*(Navigation).*(Balls).*(Comments)/m)
       end
 
       it 'does not draw empty navigation labels' do
@@ -221,8 +221,8 @@ def initialize(_user)
             label_plural 'Confirmed'
           end
         end
-        expect(helper.main_navigation).to match(/(nav\-header).*(Navigation).*(Balls).*(Commentz).*(Confirmed)/m)
-        expect(helper.main_navigation).not_to match(/(nav\-header).*(Navigation).*(Balls).*(Commentz).*(Confirmed).*(Comment)/m)
+        expect(helper.main_navigation).to match(/(dropdown-header).*(Navigation).*(Balls).*(Commentz).*(Confirmed)/m)
+        expect(helper.main_navigation).not_to match(/(dropdown-header).*(Navigation).*(Balls).*(Commentz).*(Confirmed).*(Comment)/m)
       end
 
       it 'does not show unvisible models' do
@@ -233,7 +233,7 @@ def initialize(_user)
           end
         end
         result = helper.main_navigation
-        expect(result).to match(/(nav\-header).*(Navigation).*(Balls)/m)
+        expect(result).to match(/(dropdown-header).*(Navigation).*(Balls)/m)
         expect(result).not_to match('Comments')
       end
 
@@ -244,14 +244,14 @@ def initialize(_user)
             hide
           end
         end
-        expect(helper.main_navigation).to match(/(nav\-header).*(Navigation).*(Hardballs)/m)
+        expect(helper.main_navigation).to match(/(dropdown\-header).*(Navigation).*(Hardballs)/m)
       end
 
       it 'shows children of excluded models' do
         RailsAdmin.config do |config|
           config.included_models = [Hardball]
         end
-        expect(helper.main_navigation).to match(/(nav\-header).*(Navigation).*(Hardballs)/m)
+        expect(helper.main_navigation).to match(/(dropdown-header).*(Navigation).*(Hardballs)/m)
       end
 
       it 'nests in navigation label' do
@@ -261,7 +261,7 @@ def initialize(_user)
             navigation_label 'commentable'
           end
         end
-        expect(helper.main_navigation).to match(/(nav\-header).*(Commentable).*(Comments)/m)
+        expect(helper.main_navigation).to match(/(dropdown\-header).*(Commentable).*(Comments)/m)
       end
 
       it 'nests in parent model' do
diff --git a/spec/integration/basic/list/rails_admin_basic_list_spec.rb b/spec/integration/basic/list/rails_admin_basic_list_spec.rb
index 8272fb2ffd..87185d342e 100644
--- a/spec/integration/basic/list/rails_admin_basic_list_spec.rb
+++ b/spec/integration/basic/list/rails_admin_basic_list_spec.rb
@@ -16,7 +16,7 @@
     it "redirects to dashboard and inform the user the model wasn't found" do
       visit '/admin/whatever'
       expect(page.driver.status_code).to eq(404)
-      expect(find('.alert-error')).to have_content("Model 'Whatever' could not be found")
+      expect(find('.alert-danger')).to have_content("Model 'Whatever' could not be found")
     end
   end
 
@@ -24,7 +24,7 @@
     it "redirects to balls index and inform the user the id wasn't found" do
       visit '/admin/ball/545-typo'
       expect(page.driver.status_code).to eq(404)
-      expect(find('.alert-error')).to have_content("Ball with id '545-typo' could not be found")
+      expect(find('.alert-danger')).to have_content("Ball with id '545-typo' could not be found")
     end
   end
 
@@ -315,9 +315,9 @@
     end
 
     it 'paginates correctly' do
-      expect(find('.pagination ul li:first')).to have_content('« Prev')
-      expect(find('.pagination ul li:last')).to have_content('Next »')
-      expect(find('.pagination ul li.active')).to have_content('2')
+      expect(find('ul.pagination li:first')).to have_content('« Prev')
+      expect(find('ul.pagination li:last')).to have_content('Next »')
+      expect(find('ul.pagination li.active')).to have_content('2')
     end
   end
 
@@ -329,9 +329,9 @@
     end
 
     it 'paginates correctly and contain the right item' do
-      expect(find('.pagination ul li:first')).to have_content('« Prev')
-      expect(find('.pagination ul li:last')).to have_content('Next »')
-      expect(find('.pagination ul li.active')).to have_content('3')
+      expect(find('ul.pagination li:first')).to have_content('« Prev')
+      expect(find('ul.pagination li:last')).to have_content('Next »')
+      expect(find('ul.pagination li.active')).to have_content('3')
     end
   end
 
diff --git a/spec/integration/rails_admin_spec.rb b/spec/integration/rails_admin_spec.rb
index b27739837b..f71d7ab148 100644
--- a/spec/integration/rails_admin_spec.rb
+++ b/spec/integration/rails_admin_spec.rb
@@ -125,7 +125,7 @@
   describe 'secondary navigation' do
     it 'has Gravatar image' do
       visit dashboard_path
-      is_expected.to have_selector('ul.nav.pull-right li img')
+      is_expected.to have_selector('ul.navbar-right img[src*="gravatar.com"]')
     end
 
     it "does not show Gravatar when user doesn't have email method" do
diff --git a/spec/orm/active_record.rb b/spec/orm/active_record.rb
index d99167f1fc..ed1005a4b6 100644
--- a/spec/orm/active_record.rb
+++ b/spec/orm/active_record.rb
@@ -38,6 +38,14 @@ def column_defaults
         a
       end
     end
+
+    def all
+      self
+    end
+
+    def count
+      0
+    end
   end
 
   # Override the save method to prevent exceptions.

From 644e41b43f6515da6d53dcdce572eef879297cdd Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Fri, 31 Oct 2014 11:34:42 +0900
Subject: [PATCH 27/87] Fix rubocop offenses

---
 .rubocop.yml                                  |  3 +++
 app/helpers/rails_admin/application_helper.rb | 20 +++++++++----------
 app/helpers/rails_admin/form_builder.rb       | 14 ++++++-------
 lib/rails_admin/adapters/active_record.rb     |  4 ++--
 lib/rails_admin/adapters/mongoid/property.rb  |  2 +-
 lib/rails_admin/config/configurable.rb        |  2 +-
 .../config/fields/factories/enum.rb           |  4 ++--
 .../paper_trail/auditing_adapter.rb           |  4 ++--
 lib/rails_admin/support/csv_converter.rb      | 18 ++++++++---------
 .../rails_admin/application_helper_spec.rb    |  8 ++++----
 .../export/rails_admin_basic_export_spec.rb   |  2 +-
 .../adapters/active_record_spec.rb            |  4 ++--
 spec/rails_admin/adapters/mongoid_spec.rb     |  4 ++--
 13 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 8b1691381b..2dbdcfeabf 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -5,6 +5,9 @@ AllCops:
     - 'spec/dummy_app/db/schema.rb'
     - 'vendor/bundle/**/*'
 
+Metrics/AbcSize:
+  Max: 69.98 # TODO: Lower to 15
+
 Metrics/BlockNesting:
   Max: 3
 
diff --git a/app/helpers/rails_admin/application_helper.rb b/app/helpers/rails_admin/application_helper.rb
index 8f93242f49..51a150601f 100644
--- a/app/helpers/rails_admin/application_helper.rb
+++ b/app/helpers/rails_admin/application_helper.rb
@@ -19,8 +19,8 @@ def authorized?(action, abstract_model = nil, object = nil)
 
     def current_action?(action, abstract_model = @abstract_model, object = @object)
       @action.custom_key == action.custom_key &&
-      abstract_model.try(:to_param) == @abstract_model.try(:to_param) &&
-      (@object.try(:persisted?) ? @object.id == object.try(:id) : !object.try(:persisted?))
+        abstract_model.try(:to_param) == @abstract_model.try(:to_param) &&
+        (@object.try(:persisted?) ? @object.id == object.try(:id) : !object.try(:persisted?))
     end
 
     def action(key, abstract_model = nil, object = nil)
@@ -116,7 +116,7 @@ def breadcrumb(action = @action, _acc = [])
           o = a.send(:eval, 'bindings[:object]')
           content_tag(:li, class: current_action?(a, am, o) && 'active') do
             crumb = begin
-              if not current_action?(a, am, o)
+              if !current_action?(a, am, o)
                 if a.http_methods.include?(:get)
                   link_to url_for(action: a.action_name, controller: 'rails_admin/main', model_name: am.try(:to_param), id: (o.try(:persisted?) && o.try(:id) || nil)), class: 'pjax' do
                     wording_for(:breadcrumb, a, am, o)
@@ -155,13 +155,13 @@ def bulk_menu(abstract_model = @abstract_model)
       return '' if actions.empty?
       content_tag :li, class: 'dropdown', style: 'float:right' do
         content_tag(:a, class: 'dropdown-toggle', :'data-toggle' => 'dropdown', href: '#') { t('admin.misc.bulk_menu_title').html_safe + '<b class="caret"></b>'.html_safe } +
-        content_tag(:ul, class: 'dropdown-menu', style: 'left:auto; right:0;') do
-          actions.collect do |action|
-            content_tag :li do
-              link_to wording_for(:bulk_link, action), '#', onclick: "jQuery('#bulk_action').val('#{action.action_name}'); jQuery('#bulk_form').submit(); return false;"
-            end
-          end.join.html_safe
-        end
+          content_tag(:ul, class: 'dropdown-menu', style: 'left:auto; right:0;') do
+            actions.collect do |action|
+              content_tag :li do
+                link_to wording_for(:bulk_link, action), '#', onclick: "jQuery('#bulk_action').val('#{action.action_name}'); jQuery('#bulk_form').submit(); return false;"
+              end
+            end.join.html_safe
+          end
       end.html_safe
     end
   end
diff --git a/app/helpers/rails_admin/form_builder.rb b/app/helpers/rails_admin/form_builder.rb
index 48fa840d8a..15813241d3 100644
--- a/app/helpers/rails_admin/form_builder.rb
+++ b/app/helpers/rails_admin/form_builder.rb
@@ -12,10 +12,10 @@ def generate(options = {})
         )
 
         object_infos +
-        visible_groups(options[:model_config], generator_action(options[:action], options[:nested_in])).collect do |fieldset|
-          fieldset_for fieldset, options[:nested_in]
-        end.join.html_safe +
-        (options[:nested_in] ? '' : @template.render(partial: 'rails_admin/main/submit_buttons'))
+          visible_groups(options[:model_config], generator_action(options[:action], options[:nested_in])).collect do |fieldset|
+            fieldset_for fieldset, options[:nested_in]
+          end.join.html_safe +
+          (options[:nested_in] ? '' : @template.render(partial: 'rails_admin/main/submit_buttons'))
       end
     end
 
@@ -36,7 +36,7 @@ def field_wrapper_for(field, nested_in)
         unless nested_field_association?(field, nested_in)
           @template.content_tag(:div, class: "form-group control-group #{field.type_css_class} #{field.css_class} #{'error' if field.errors.present?}", id: "#{dom_id(field)}_field") do
             label(field.method_name, capitalize_first_letter(field.label), class: 'col-sm-2 control-label') +
-            (field.nested_form ? field_for(field) : input_for(field))
+              (field.nested_form ? field_for(field) : input_for(field))
           end
         end
       else
@@ -49,8 +49,8 @@ def input_for(field)
       css += ' has-error' if field.errors.present?
       @template.content_tag(:div, class: css) do
         field_for(field) +
-        errors_for(field) +
-        help_for(field)
+          errors_for(field) +
+          help_for(field)
       end
     end
 
diff --git a/lib/rails_admin/adapters/active_record.rb b/lib/rails_admin/adapters/active_record.rb
index fb4cc9437c..9d627096ca 100644
--- a/lib/rails_admin/adapters/active_record.rb
+++ b/lib/rails_admin/adapters/active_record.rb
@@ -56,8 +56,8 @@ def associations
       def properties
         columns = model.columns.reject do |c|
           c.type.blank? ||
-            DISABLED_COLUMN_TYPES.include?(c.type.to_sym) ||
-            c.try(:array)
+          DISABLED_COLUMN_TYPES.include?(c.type.to_sym) ||
+          c.try(:array)
         end
         columns.collect do |property|
           Property.new(property, model)
diff --git a/lib/rails_admin/adapters/mongoid/property.rb b/lib/rails_admin/adapters/mongoid/property.rb
index 026695c731..ffe0bb4130 100644
--- a/lib/rails_admin/adapters/mongoid/property.rb
+++ b/lib/rails_admin/adapters/mongoid/property.rb
@@ -71,7 +71,7 @@ def read_only?
 
         def object_field_type
           if [:belongs_to, :referenced_in, :embedded_in].
-            include?(model.relations.values.detect { |r| r.foreign_key.try(:to_sym) == name }.try(:macro).try(:to_sym))
+             include?(model.relations.values.detect { |r| r.foreign_key.try(:to_sym) == name }.try(:macro).try(:to_sym))
             :bson_object_id
           else
             :string
diff --git a/lib/rails_admin/config/configurable.rb b/lib/rails_admin/config/configurable.rb
index 7a266c1684..2d5f06ac11 100644
--- a/lib/rails_admin/config/configurable.rb
+++ b/lib/rails_admin/config/configurable.rb
@@ -29,7 +29,7 @@ module ClassMethods
         # accessed by an instance method. Both go by the name of the option.
         def register_instance_option(option_name, scope = self, &default)
           options = scope.instance_variable_get('@config_options') ||
-                      scope.instance_variable_set('@config_options', {})
+                    scope.instance_variable_set('@config_options', {})
 
           option_name = option_name.to_s
           options[option_name] = nil
diff --git a/lib/rails_admin/config/fields/factories/enum.rb b/lib/rails_admin/config/fields/factories/enum.rb
index edaad64245..2c6d1db375 100644
--- a/lib/rails_admin/config/fields/factories/enum.rb
+++ b/lib/rails_admin/config/fields/factories/enum.rb
@@ -8,8 +8,8 @@
 
   # NOTICE: _method_name could be `to_enum` and this method defined in Object.
   if !Object.respond_to?(method_name) && \
-      (model.respond_to?(method_name) || \
-          model.method_defined?(method_name))
+     (model.respond_to?(method_name) || \
+         model.method_defined?(method_name))
     fields << RailsAdmin::Config::Fields::Types::Enum.new(parent, properties.name, properties)
     true
   else
diff --git a/lib/rails_admin/extensions/paper_trail/auditing_adapter.rb b/lib/rails_admin/extensions/paper_trail/auditing_adapter.rb
index 2a75d30d4d..61a31917b9 100644
--- a/lib/rails_admin/extensions/paper_trail/auditing_adapter.rb
+++ b/lib/rails_admin/extensions/paper_trail/auditing_adapter.rb
@@ -107,8 +107,8 @@ def listing_for_model_or_object(model, object, query, sort, sort_reverse, all, p
 
         def version_class_for(model_name)
           klass = model_name.constantize.
-            try(:version_class_name).
-            try(:constantize)
+                  try(:version_class_name).
+                  try(:constantize)
 
           klass || @version_class
         end
diff --git a/lib/rails_admin/support/csv_converter.rb b/lib/rails_admin/support/csv_converter.rb
index 08a6aff0e3..90ce7614a1 100644
--- a/lib/rails_admin/support/csv_converter.rb
+++ b/lib/rails_admin/support/csv_converter.rb
@@ -80,23 +80,23 @@ def generate_csv_header
       @fields.collect do |field|
         ::I18n.t('admin.export.csv.header_for_root_methods', name: field.label, model: @abstract_model.pretty_name)
       end +
-      @associations.flat_map do |_association_name, option_hash|
-        option_hash[:fields].collect do |field|
-          ::I18n.t('admin.export.csv.header_for_association_methods', name: field.label, association: option_hash[:association].label)
+        @associations.flat_map do |_association_name, option_hash|
+          option_hash[:fields].collect do |field|
+            ::I18n.t('admin.export.csv.header_for_association_methods', name: field.label, association: option_hash[:association].label)
+          end
         end
-      end
     end
 
     def generate_csv_row(object)
       @fields.collect do |field|
         field.with(object: object).export_value
       end +
-      @associations.flat_map do |association_name, option_hash|
-        associated_objects = [object.send(association_name)].flatten.compact
-        option_hash[:fields].collect do |field|
-          associated_objects.collect { |ao| field.with(object: ao).export_value.presence || @empty }.join(',')
+        @associations.flat_map do |association_name, option_hash|
+          associated_objects = [object.send(association_name)].flatten.compact
+          option_hash[:fields].collect do |field|
+            associated_objects.collect { |ao| field.with(object: ao).export_value.presence || @empty }.join(',')
+          end
         end
-      end
     end
   end
 end
diff --git a/spec/helpers/rails_admin/application_helper_spec.rb b/spec/helpers/rails_admin/application_helper_spec.rb
index f09e152270..5160d80f69 100644
--- a/spec/helpers/rails_admin/application_helper_spec.rb
+++ b/spec/helpers/rails_admin/application_helper_spec.rb
@@ -69,8 +69,8 @@ def initialize(_user)
             member :test_bindings do
               visible do
                 bindings[:controller].is_a?(ActionView::TestCase::TestController) &&
-                bindings[:abstract_model].model == Team &&
-                bindings[:object].is_a?(Team)
+                  bindings[:abstract_model].model == Team &&
+                  bindings[:object].is_a?(Team)
               end
             end
           end
@@ -97,8 +97,8 @@ def initialize(_user)
             member :test_bindings do
               visible do
                 bindings[:controller].is_a?(ActionView::TestCase::TestController) &&
-                bindings[:abstract_model].model == Team &&
-                bindings[:object].is_a?(Team)
+                  bindings[:abstract_model].model == Team &&
+                  bindings[:object].is_a?(Team)
               end
             end
           end
diff --git a/spec/integration/basic/export/rails_admin_basic_export_spec.rb b/spec/integration/basic/export/rails_admin_basic_export_spec.rb
index 6e1455747c..028fa9f81c 100644
--- a/spec/integration/basic/export/rails_admin_basic_export_spec.rb
+++ b/spec/integration/basic/export/rails_admin_basic_export_spec.rb
@@ -78,7 +78,7 @@
       # and Mongoid with ActiveModel 3.1 does not support to_xml's :include options
       # (due change of implementation in ActiveModel::Serializers between 3.1 and 3.2)
       if RUBY_VERSION =~ /1\.9/ &&
-          (CI_ORM != :mongoid || (CI_ORM == :mongoid && ActiveModel::VERSION::STRING >= '3.2'))
+         (CI_ORM != :mongoid || (CI_ORM == :mongoid && ActiveModel::VERSION::STRING >= '3.2'))
         is_expected.to have_content @player.team.name
       end
     end
diff --git a/spec/rails_admin/adapters/active_record_spec.rb b/spec/rails_admin/adapters/active_record_spec.rb
index ed649ba3ae..58251b7723 100644
--- a/spec/rails_admin/adapters/active_record_spec.rb
+++ b/spec/rails_admin/adapters/active_record_spec.rb
@@ -95,7 +95,7 @@
     before do
       @abstract_model = RailsAdmin::AbstractModel.new('Team')
       @teams = [{}, {name: 'somewhere foos'}, {manager: 'foo junior'}].
-        collect { |h| FactoryGirl.create :team, h }
+               collect { |h| FactoryGirl.create :team, h }
     end
 
     it 'makes correct query' do
@@ -122,7 +122,7 @@
       @abstract_model = RailsAdmin::AbstractModel.new('Team')
       @division = FactoryGirl.create :division, name: 'bar division'
       @teams = [{}, {division: @division}, {name: 'somewhere foos', division: @division}, {name: 'nowhere foos'}].
-        collect { |h| FactoryGirl.create :team, h }
+               collect { |h| FactoryGirl.create :team, h }
     end
 
     context 'without configuration' do
diff --git a/spec/rails_admin/adapters/mongoid_spec.rb b/spec/rails_admin/adapters/mongoid_spec.rb
index 6c54fafa35..908261f17f 100644
--- a/spec/rails_admin/adapters/mongoid_spec.rb
+++ b/spec/rails_admin/adapters/mongoid_spec.rb
@@ -192,7 +192,7 @@
     before do
       @abstract_model = RailsAdmin::AbstractModel.new('Player')
       @players = [{}, {name: 'Many foos'}, {position: 'foo shortage'}].
-        collect { |h| FactoryGirl.create :player, h }
+                 collect { |h| FactoryGirl.create :player, h }
     end
 
     it 'makes correct query' do
@@ -205,7 +205,7 @@
       @abstract_model = RailsAdmin::AbstractModel.new('Player')
       @team = FactoryGirl.create :team, name: 'king of bar'
       @players = [{}, {team: @team}, {name: 'Many foos', team: @team}, {name: 'Great foo'}].
-        collect { |h| FactoryGirl.create :player, h }
+                 collect { |h| FactoryGirl.create :player, h }
     end
 
     it 'makes correct query' do

From c71e2d25bf17d5130ee822812d595ef97a1b02e2 Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Fri, 31 Oct 2014 12:15:37 +0900
Subject: [PATCH 28/87] Get rid of navbar record count badges

Because counting records on every tables upon each request might affect performance massively. Refs #1104
---
 app/helpers/rails_admin/application_helper.rb | 4 +---
 spec/orm/active_record.rb                     | 8 --------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/app/helpers/rails_admin/application_helper.rb b/app/helpers/rails_admin/application_helper.rb
index 51a150601f..9c80796e0b 100644
--- a/app/helpers/rails_admin/application_helper.rb
+++ b/app/helpers/rails_admin/application_helper.rb
@@ -96,10 +96,8 @@ def navigation(nodes_stack, nodes, level = 0)
         url         = url_for(action: :index, controller: 'rails_admin/main', model_name: model_param)
         level_class = " nav-level-#{level}" if level > 0
         nav_icon = node.navigation_icon ? %(<i class="#{node.navigation_icon}"></i>).html_safe : ''
-        count = node.abstract_model.count
-        badge = %( <span class='badge pull-right'>#{count}</span>).html_safe
         li = content_tag :li, 'data-model' => model_param do
-          link_to badge + nav_icon + capitalize_first_letter(node.label_plural), url, class: "pjax#{level_class}"
+          link_to nav_icon + capitalize_first_letter(node.label_plural), url, class: "pjax#{level_class}"
         end
         li + navigation(nodes_stack, nodes_stack.select { |n| n.parent.to_s == node.abstract_model.model_name }, level + 1)
       end.join.html_safe
diff --git a/spec/orm/active_record.rb b/spec/orm/active_record.rb
index ed1005a4b6..d99167f1fc 100644
--- a/spec/orm/active_record.rb
+++ b/spec/orm/active_record.rb
@@ -38,14 +38,6 @@ def column_defaults
         a
       end
     end
-
-    def all
-      self
-    end
-
-    def count
-      0
-    end
   end
 
   # Override the save method to prevent exceptions.

From dfa708d6ec97663f56657e5d6538782a55f88c2c Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Sat, 1 Nov 2014 22:47:36 +0900
Subject: [PATCH 29/87] Flash keys are Symbol in Rails 4.0

---
 app/views/layouts/rails_admin/pjax.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/rails_admin/pjax.html.haml b/app/views/layouts/rails_admin/pjax.html.haml
index 51310a2ee5..0acf2e861a 100644
--- a/app/views/layouts/rails_admin/pjax.html.haml
+++ b/app/views/layouts/rails_admin/pjax.html.haml
@@ -6,7 +6,7 @@
 .page-header
   %h1= @page_name
 - flash && flash.each do |key, value|
-  - key = 'danger' if key == 'error'
+  - key = 'danger' if key.to_s == 'error'
   .alert{class: "alert-#{key}"}
     %a.close{href: '#', :'data-dismiss' => "alert"} &times;
     = value

From 2d08f7c0bf412641c8f4d6fd928170a6df27434f Mon Sep 17 00:00:00 2001
From: William Charlton <william.j.charlton@gmail.com>
Date: Wed, 5 Nov 2014 15:35:40 -0500
Subject: [PATCH 30/87] Fix admin in IE

Ensure Internet Explorer uses the latest engine to prevent missing
icons and layout issues.
---
 app/views/layouts/rails_admin/application.html.haml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/layouts/rails_admin/application.html.haml b/app/views/layouts/rails_admin/application.html.haml
index 8df379e668..ea0ebb16ba 100644
--- a/app/views/layouts/rails_admin/application.html.haml
+++ b/app/views/layouts/rails_admin/application.html.haml
@@ -1,6 +1,7 @@
 !!! 5
 %html
   %head
+    %meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}
     %meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}
     %meta{content: "NONE,NOARCHIVE", name: "robots"}
     = csrf_meta_tag

From 4a2a13b4af82bdcdb7d8bf57d3eea998820dab0b Mon Sep 17 00:00:00 2001
From: Jake Quain <quainjn@gmail.com>
Date: Thu, 13 Nov 2014 16:57:01 -0700
Subject: [PATCH 31/87] Use default label if object label would be blank

---
 lib/rails_admin/config/model.rb       | 3 ++-
 spec/rails_admin/config/model_spec.rb | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/rails_admin/config/model.rb b/lib/rails_admin/config/model.rb
index 32bb922d3a..d1b39bad57 100644
--- a/lib/rails_admin/config/model.rb
+++ b/lib/rails_admin/config/model.rb
@@ -44,7 +44,8 @@ def excluded?
       end
 
       def object_label
-        bindings[:object].send object_label_method
+        bindings[:object].send(object_label_method).presence ||
+          bindings[:object].send(:rails_admin_default_object_label_method)
       end
 
       # The display for a model instance (i.e. a single database record).
diff --git a/spec/rails_admin/config/model_spec.rb b/spec/rails_admin/config/model_spec.rb
index b8a9d8cd1d..3bb109bc54 100644
--- a/spec/rails_admin/config/model_spec.rb
+++ b/spec/rails_admin/config/model_spec.rb
@@ -26,6 +26,13 @@
       c = Comment.new(content: 'test')
       expect(RailsAdmin.config(Comment).with(object: c).object_label).to eq('test')
     end
+
+    context 'when the object_label_method is blank' do
+      it 'uses the rails admin default' do
+        c = Comment.create(content: '', id: '1')
+        expect(RailsAdmin.config(Comment).with(object: c).object_label).to eq('Comment #1')
+      end
+    end
   end
 
   describe '#object_label_method' do

From bfaefdd1299b1be982cae18e9ac4ec62407dd3d4 Mon Sep 17 00:00:00 2001
From: Penn Su <pennsu@gmail.com>
Date: Sat, 15 Nov 2014 02:59:21 -0800
Subject: [PATCH 32/87] Fix sidebar not scrollable when models exceeds the
 height of the window

Signed-off-by: Penn Su <pennsu@gmail.com>
---
 app/assets/stylesheets/rails_admin/base/theming.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/rails_admin/base/theming.scss b/app/assets/stylesheets/rails_admin/base/theming.scss
index b50d4324fe..71d61cac8f 100644
--- a/app/assets/stylesheets/rails_admin/base/theming.scss
+++ b/app/assets/stylesheets/rails_admin/base/theming.scss
@@ -29,7 +29,9 @@ body.rails_admin {
     padding: 9px 9px 9px 9px;
     position: fixed;
     width: 14%;
-    height: 100%;
+    overflow-y: scroll;
+    top: 50px;
+    bottom: 0;
     background: #eaf0f1;
   }
 

From 44df8588eadb561442b88d1b0d23479f10e79f03 Mon Sep 17 00:00:00 2001
From: Rafael Carvalho <rafael@algorich.com.br>
Date: Mon, 17 Nov 2014 11:23:35 -0200
Subject: [PATCH 33/87] Added pjax class for scope selectors

---
 app/views/rails_admin/main/index.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/rails_admin/main/index.html.haml b/app/views/rails_admin/main/index.html.haml
index 61780881d3..e8bbb5bc7a 100644
--- a/app/views/rails_admin/main/index.html.haml
+++ b/app/views/rails_admin/main/index.html.haml
@@ -110,7 +110,7 @@
       - @model_config.list.scopes.each_with_index do |scope, index|
         - scope = '_all' if scope.nil?
         %li{class: "#{'active' if scope.to_s == params[:scope] || (params[:scope].blank? && index == 0)}"}
-          %a{href: index_path(params.merge(scope: scope, page: nil))}= I18n.t("admin.scopes.#{@abstract_model.to_param}.#{scope}", default: I18n.t("admin.scopes.#{scope}", default: scope.to_s.titleize))
+          %a{href: index_path(params.merge(scope: scope, page: nil)) class: 'pjax'}= I18n.t("admin.scopes.#{@abstract_model.to_param}.#{scope}", default: I18n.t("admin.scopes.#{scope}", default: scope.to_s.titleize))
 
   = form_tag bulk_action_path(model_name: @abstract_model.to_param), method: :post, id: "bulk_form", class: "form" do
     = hidden_field_tag :bulk_action

From 4d086c14e3ac74a5d046439fece58957ebbc7186 Mon Sep 17 00:00:00 2001
From: johanneskrtek <johannes.krtek@flachware.com>
Date: Sun, 23 Nov 2014 15:28:39 +0100
Subject: [PATCH 34/87] Update export.html.haml

Remove redundant %div from markup. %legend as first element in %fieldsets (more flexibility for CSS styling). Wrap checkbox in label with class 'checkbox' for proper alignment.
---
 app/views/rails_admin/main/export.html.haml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/views/rails_admin/main/export.html.haml b/app/views/rails_admin/main/export.html.haml
index 358e9378d3..48e9782ca4 100644
--- a/app/views/rails_admin/main/export.html.haml
+++ b/app/views/rails_admin/main/export.html.haml
@@ -5,15 +5,15 @@
 
   %input{name: "send_data", type: "hidden", value: "true"}/
   %fieldset{id: 'fields_to_export'}
-    %div.control-group
-      %div.controls
+    %legend
+      %i.icon-chevron-down
+      = t('admin.export.select')
+    .control-group
+      .controls
         .col-sm-2
         %label.col-sm-10.checkbox{for: 'check_all'}
           = check_box_tag 'all', 'all', true, { id: 'check_all' }
           = t('admin.export.select_all_fields')
-    %legend
-      %i.icon-chevron-down
-      = t('admin.export.select')
     .control-group
       %label.col-sm-2.control-label{rel: 'tooltip', :'data-original-title' => t('admin.export.click_to_reverse_selection'), onclick: 'jQuery(this).siblings(".controls").find("input").click()'}= t('admin.export.fields_from', name: @model_config.label_plural.downcase)
       .col-sm-10.controls
@@ -58,7 +58,8 @@
     .control-group
       %label.col-sm-2.control-label{for: "csv_options_skip_header"}= t('admin.export.csv.skip_header')
       .col-sm-10.controls
-        = check_box_tag 'csv_options[skip_header]', 'true'
+        %label.checkbox
+          = check_box_tag 'csv_options[skip_header]', 'true'
         %p.help-block= t('admin.export.csv.skip_header_help')
 
     .control-group

From a6d58829af556f8ca515d32891d8278620fb2b63 Mon Sep 17 00:00:00 2001
From: Rafael Carvalho <rafael@algorich.com.br>
Date: Mon, 24 Nov 2014 10:46:55 -0200
Subject: [PATCH 35/87] Added a missing comma at index template

---
 app/views/rails_admin/main/index.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/rails_admin/main/index.html.haml b/app/views/rails_admin/main/index.html.haml
index e8bbb5bc7a..76bc908ac7 100644
--- a/app/views/rails_admin/main/index.html.haml
+++ b/app/views/rails_admin/main/index.html.haml
@@ -110,7 +110,7 @@
       - @model_config.list.scopes.each_with_index do |scope, index|
         - scope = '_all' if scope.nil?
         %li{class: "#{'active' if scope.to_s == params[:scope] || (params[:scope].blank? && index == 0)}"}
-          %a{href: index_path(params.merge(scope: scope, page: nil)) class: 'pjax'}= I18n.t("admin.scopes.#{@abstract_model.to_param}.#{scope}", default: I18n.t("admin.scopes.#{scope}", default: scope.to_s.titleize))
+          %a{href: index_path(params.merge(scope: scope, page: nil)), class: 'pjax'}= I18n.t("admin.scopes.#{@abstract_model.to_param}.#{scope}", default: I18n.t("admin.scopes.#{scope}", default: scope.to_s.titleize))
 
   = form_tag bulk_action_path(model_name: @abstract_model.to_param), method: :post, id: "bulk_form", class: "form" do
     = hidden_field_tag :bulk_action

From ea424e16ac83b58e0bf0ca07689c02f69ed140d7 Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Thu, 4 Dec 2014 13:19:13 +0900
Subject: [PATCH 36/87] Fix Rails 4.2 build

---
 spec/integration/config/show/rails_admin_config_show_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/integration/config/show/rails_admin_config_show_spec.rb b/spec/integration/config/show/rails_admin_config_show_spec.rb
index f51162bb98..77a4a036ba 100644
--- a/spec/integration/config/show/rails_admin_config_show_spec.rb
+++ b/spec/integration/config/show/rails_admin_config_show_spec.rb
@@ -22,7 +22,7 @@ def do_request
     end
 
     it 'contains the JSONified object' do
-      expect(body).to include(@player.reload.to_json)
+      expect(JSON.parse(body)).to eq JSON.parse @player.to_json
     end
   end
 

From d5491c934b40d6e91268b731c0b2d063156073a1 Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Fri, 5 Dec 2014 10:54:52 +0900
Subject: [PATCH 37/87] Force reload to truncate subseconds

---
 spec/integration/config/show/rails_admin_config_show_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/integration/config/show/rails_admin_config_show_spec.rb b/spec/integration/config/show/rails_admin_config_show_spec.rb
index 77a4a036ba..d889cd2ce5 100644
--- a/spec/integration/config/show/rails_admin_config_show_spec.rb
+++ b/spec/integration/config/show/rails_admin_config_show_spec.rb
@@ -22,7 +22,7 @@ def do_request
     end
 
     it 'contains the JSONified object' do
-      expect(JSON.parse(body)).to eq JSON.parse @player.to_json
+      expect(JSON.parse(body)).to eq JSON.parse @player.reload.to_json
     end
   end
 

From 09de8d7705f74fdd5e1bf0116edd000c8b8bebe2 Mon Sep 17 00:00:00 2001
From: Joao Vortmann <jvortmann@gmail.com>
Date: Fri, 5 Dec 2014 23:02:01 -0200
Subject: [PATCH 38/87] Improve logout method configuration by using first
 sign_out_via option on Devise. Thanks @carlesso

---
 app/helpers/rails_admin/application_helper.rb     |  2 +-
 .../rails_admin/application_helper_spec.rb        | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/app/helpers/rails_admin/application_helper.rb b/app/helpers/rails_admin/application_helper.rb
index 9c80796e0b..9119ee2c3a 100644
--- a/app/helpers/rails_admin/application_helper.rb
+++ b/app/helpers/rails_admin/application_helper.rb
@@ -48,7 +48,7 @@ def logout_path
     end
 
     def logout_method
-      return Devise.sign_out_via if defined?(Devise)
+      return [Devise.sign_out_via].flatten.first if defined?(Devise)
       :delete
     end
 
diff --git a/spec/helpers/rails_admin/application_helper_spec.rb b/spec/helpers/rails_admin/application_helper_spec.rb
index 5160d80f69..41a5aa987d 100644
--- a/spec/helpers/rails_admin/application_helper_spec.rb
+++ b/spec/helpers/rails_admin/application_helper_spec.rb
@@ -110,6 +110,21 @@ def initialize(_user)
       end
     end
 
+    describe '#logout_method' do
+      it 'defaults to :delete when Devise is not defined' do
+        allow(Object).to receive(:defined?).with(Devise).and_return(false)
+
+        expect(helper.logout_method).to eq(:delete)
+      end
+
+      it 'uses first sign out method from Devise when it is defined' do
+        allow(Object).to receive(:defined?).with(Devise).and_return(true)
+
+        expect(Devise).to receive(:sign_out_via).and_return([:whatever_defined_on_devise, :something_ignored])
+        expect(helper.logout_method).to eq(:whatever_defined_on_devise)
+      end
+    end
+
     describe '#wording_for' do
       it 'gives correct wording even if action is not visible' do
         RailsAdmin.config do |config|

From 4c9708a3a9dbbb85ba17efe266ebde6d42cd9951 Mon Sep 17 00:00:00 2001
From: Enrico Carlesso <enricocarlesso@gmail.com>
Date: Tue, 9 Dec 2014 00:32:55 +0100
Subject: [PATCH 39/87] Use label instead of badge for boolean elements as per
 sferik/rails_admin#2131

---
 lib/rails_admin/config/fields/types/boolean.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/rails_admin/config/fields/types/boolean.rb b/lib/rails_admin/config/fields/types/boolean.rb
index 6d5c3204ad..f704a5af23 100644
--- a/lib/rails_admin/config/fields/types/boolean.rb
+++ b/lib/rails_admin/config/fields/types/boolean.rb
@@ -13,11 +13,11 @@ class Boolean < RailsAdmin::Config::Fields::Base
           register_instance_option :pretty_value do
             case value
             when nil
-              %(<span class='badge'>-</span>)
+              %(<span class='label label-default'>-</span>)
             when false
-              %(<span class='badge badge-important'>&#x2718;</span>)
+              %(<span class='label label-danger'>&#x2718;</span>)
             when true
-              %(<span class='badge badge-success'>&#x2713;</span>)
+              %(<span class='label label-success'>&#x2713;</span>)
             end.html_safe
           end
 

From 6d2f6c6d1eee31086c1b35021c675fb31d5294ee Mon Sep 17 00:00:00 2001
From: Enrico Carlesso <enricocarlesso@gmail.com>
Date: Tue, 9 Dec 2014 00:39:44 +0100
Subject: [PATCH 40/87] =?UTF-8?q?Using=20=E2=80=92=20(dash)=20instead=20-?=
 =?UTF-8?q?=20result=20in=20equal=20sized=20boolean=20indicators?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/rails_admin/config/fields/types/boolean.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/rails_admin/config/fields/types/boolean.rb b/lib/rails_admin/config/fields/types/boolean.rb
index f704a5af23..3a8ebbd6c8 100644
--- a/lib/rails_admin/config/fields/types/boolean.rb
+++ b/lib/rails_admin/config/fields/types/boolean.rb
@@ -13,7 +13,7 @@ class Boolean < RailsAdmin::Config::Fields::Base
           register_instance_option :pretty_value do
             case value
             when nil
-              %(<span class='label label-default'>-</span>)
+              %(<span class='label label-default'>‒</span>)
             when false
               %(<span class='label label-danger'>&#x2718;</span>)
             when true

From 02d90f3e85f87fbbbcefd57da56e0110993c3417 Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Thu, 11 Dec 2014 14:35:15 +0100
Subject: [PATCH 41/87] Remove emtpy lines from beginning and end of blocks

---
 app/helpers/rails_admin/application_helper.rb         |  1 -
 lib/rails_admin/config/actions/bulk_delete.rb         |  1 -
 lib/rails_admin/config/actions/edit.rb                |  2 --
 lib/rails_admin/config/actions/export.rb              |  2 --
 lib/rails_admin/config/actions/index.rb               |  3 ---
 lib/rails_admin/config/actions/new.rb                 |  2 --
 lib/rails_admin/config/fields/factories/enum.rb       |  1 -
 spec/controllers/rails_admin/main_controller_spec.rb  |  3 ---
 spec/helpers/rails_admin/application_helper_spec.rb   |  1 -
 spec/integration/authorization/cancan_spec.rb         |  5 -----
 spec/integration/authorization/cancancan_spec.rb      |  5 -----
 .../bulk_action/rails_admin_basic_bulk_action_spec.rb |  1 -
 .../rails_admin_namespaced_model_create_spec.rb       |  1 -
 .../basic/delete/rails_admin_basic_delete_spec.rb     |  1 -
 .../basic/destroy/rails_admin_basic_destroy_spec.rb   |  1 -
 .../basic/edit/rails_admin_basic_edit_spec.rb         |  4 ----
 .../basic/export/rails_admin_basic_export_spec.rb     |  2 --
 .../basic/list/rails_admin_basic_list_spec.rb         |  2 --
 .../basic/new/rails_admin_basic_new_spec.rb           |  1 -
 .../new/rails_admin_namespaced_model_new_spec.rb      |  1 -
 .../basic/update/rails_admin_basic_update_spec.rb     |  2 --
 .../config/edit/rails_admin_config_edit_spec.rb       | 11 -----------
 .../config/list/rails_admin_config_list_spec.rb       |  3 ---
 .../config/show/rails_admin_config_show_spec.rb       |  1 -
 spec/integration/history/rails_admin_history_spec.rb  |  1 -
 spec/integration/rails_admin_spec.rb                  |  4 ----
 spec/integration/relation_spec.rb                     |  1 -
 spec/rails_admin/abstract_model_spec.rb               |  2 --
 spec/rails_admin/config/actions/base_spec.rb          |  1 -
 spec/rails_admin/config/actions_spec.rb               |  1 -
 spec/rails_admin/config/fields/base_spec.rb           |  2 --
 spec/rails_admin/config/fields/types/json_spec.rb     |  1 -
 spec/rails_admin/config/has_fields_spec.rb            |  1 -
 spec/rails_admin/config/model_spec.rb                 |  2 --
 spec/rails_admin/config/sections_spec.rb              |  2 --
 spec/rails_admin/config_spec.rb                       |  3 ---
 36 files changed, 78 deletions(-)

diff --git a/app/helpers/rails_admin/application_helper.rb b/app/helpers/rails_admin/application_helper.rb
index 9119ee2c3a..b664f5ff57 100644
--- a/app/helpers/rails_admin/application_helper.rb
+++ b/app/helpers/rails_admin/application_helper.rb
@@ -70,7 +70,6 @@ def main_navigation
       node_model_names = nodes_stack.collect { |c| c.abstract_model.model_name }
 
       nodes_stack.group_by(&:navigation_label).collect do |navigation_label, nodes|
-
         nodes = nodes.select { |n| n.parent.nil? || !n.parent.to_s.in?(node_model_names) }
         li_stack = navigation nodes_stack, nodes
 
diff --git a/lib/rails_admin/config/actions/bulk_delete.rb b/lib/rails_admin/config/actions/bulk_delete.rb
index 940b42c5b0..c0a5edd094 100644
--- a/lib/rails_admin/config/actions/bulk_delete.rb
+++ b/lib/rails_admin/config/actions/bulk_delete.rb
@@ -14,7 +14,6 @@ class BulkDelete < RailsAdmin::Config::Actions::Base
 
         register_instance_option :controller do
           proc do
-
             if request.post? # BULK DELETE
 
               @objects = list_entries(@model_config, :destroy)
diff --git a/lib/rails_admin/config/actions/edit.rb b/lib/rails_admin/config/actions/edit.rb
index a96032d1e7..8513e09c88 100644
--- a/lib/rails_admin/config/actions/edit.rb
+++ b/lib/rails_admin/config/actions/edit.rb
@@ -14,7 +14,6 @@ class Edit < RailsAdmin::Config::Actions::Base
 
         register_instance_option :controller do
           proc do
-
             if request.get? # EDIT
 
               respond_to do |format|
@@ -41,7 +40,6 @@ class Edit < RailsAdmin::Config::Actions::Base
               end
 
             end
-
           end
         end
 
diff --git a/lib/rails_admin/config/actions/export.rb b/lib/rails_admin/config/actions/export.rb
index 6d319c7382..9930f1ab4d 100644
--- a/lib/rails_admin/config/actions/export.rb
+++ b/lib/rails_admin/config/actions/export.rb
@@ -14,7 +14,6 @@ class Export < RailsAdmin::Config::Actions::Base
 
         register_instance_option :controller do
           proc do
-
             if format = params[:json] && :json || params[:csv] && :csv || params[:xml] && :xml
               request.format = format
               @schema = params[:schema].symbolize if params[:schema] # to_json and to_xml expect symbols for keys AND values.
@@ -23,7 +22,6 @@ class Export < RailsAdmin::Config::Actions::Base
             else
               render @action.template_name
             end
-
           end
         end
 
diff --git a/lib/rails_admin/config/actions/index.rb b/lib/rails_admin/config/actions/index.rb
index bee2149513..9ee2dae199 100644
--- a/lib/rails_admin/config/actions/index.rb
+++ b/lib/rails_admin/config/actions/index.rb
@@ -40,7 +40,6 @@ class Index < RailsAdmin::Config::Actions::Base
             end
 
             respond_to do |format|
-
               format.html do
                 render @action.template_name, status: (flash[:error].present? ? :not_found : 200)
               end
@@ -81,9 +80,7 @@ class Index < RailsAdmin::Config::Actions::Base
                   render text: output
                 end
               end
-
             end
-
           end
         end
 
diff --git a/lib/rails_admin/config/actions/new.rb b/lib/rails_admin/config/actions/new.rb
index e89d1f4ab0..513f74fb72 100644
--- a/lib/rails_admin/config/actions/new.rb
+++ b/lib/rails_admin/config/actions/new.rb
@@ -13,9 +13,7 @@ class New < RailsAdmin::Config::Actions::Base
         end
 
         register_instance_option :controller do
-
           proc do
-
             if request.get? # NEW
 
               @object = @abstract_model.new
diff --git a/lib/rails_admin/config/fields/factories/enum.rb b/lib/rails_admin/config/fields/factories/enum.rb
index 2c6d1db375..87f45b6ea9 100644
--- a/lib/rails_admin/config/fields/factories/enum.rb
+++ b/lib/rails_admin/config/fields/factories/enum.rb
@@ -2,7 +2,6 @@
 require 'rails_admin/config/fields/types/enum'
 
 RailsAdmin::Config::Fields.register_factory do |parent, properties, fields|
-
   model = parent.abstract_model.model
   method_name = "#{properties.name}_enum"
 
diff --git a/spec/controllers/rails_admin/main_controller_spec.rb b/spec/controllers/rails_admin/main_controller_spec.rb
index 6691617cc3..1d33c5f452 100644
--- a/spec/controllers/rails_admin/main_controller_spec.rb
+++ b/spec/controllers/rails_admin/main_controller_spec.rb
@@ -28,7 +28,6 @@
   end
 
   describe '#check_for_cancel' do
-
     it 'redirects to back if params[:bulk_ids] is nil when params[:bulk_action] is present' do
       allow(controller).to receive(:back_or_index) { fail(StandardError.new('redirected back')) }
       expect { get :bulk_delete, model_name: 'player', bulk_action: 'bulk_delete' }.to raise_error('redirected back')
@@ -300,7 +299,6 @@ class TeamWithNumberedPlayers < Team
     end
 
     it 'allows for delete method with Carrierwave' do
-
       RailsAdmin.config FieldTest do
         field :carrierwave_asset
         field :dragonfly_asset
@@ -355,5 +353,4 @@ class TeamWithNumberedPlayers < Team
         })
     end
   end
-
 end
diff --git a/spec/helpers/rails_admin/application_helper_spec.rb b/spec/helpers/rails_admin/application_helper_spec.rb
index 41a5aa987d..1f0827d703 100644
--- a/spec/helpers/rails_admin/application_helper_spec.rb
+++ b/spec/helpers/rails_admin/application_helper_spec.rb
@@ -155,7 +155,6 @@ def initialize(_user)
 
         expect(helper.wording_for(:link, :new, RailsAdmin::AbstractModel.new(Team))).to eq('Add a new Team')
       end
-
     end
 
     describe '#breadcrumb' do
diff --git a/spec/integration/authorization/cancan_spec.rb b/spec/integration/authorization/cancan_spec.rb
index 5127a67c0f..a599f705a6 100644
--- a/spec/integration/authorization/cancan_spec.rb
+++ b/spec/integration/authorization/cancan_spec.rb
@@ -40,7 +40,6 @@ def initialize(user)
 end
 
 describe 'RailsAdmin CanCan Authorization', type: :request do
-
   subject { page }
 
   before do
@@ -111,7 +110,6 @@ def initialize(user)
     it 'GET /admin/player/new should raise CanCan::AccessDenied' do
       expect { visit new_path(model_name: 'player') }.to raise_error(CanCan::AccessDenied)
     end
-
   end
 
   describe 'with create and read player role' do
@@ -143,7 +141,6 @@ def initialize(user)
       @player = FactoryGirl.create :player
       expect { visit edit_path(model_name: 'player', id: @player.id) }.to raise_error(CanCan::AccessDenied)
     end
-
   end
 
   describe 'with update and read player role' do
@@ -175,12 +172,10 @@ def initialize(user)
       @player = FactoryGirl.create :player
       expect { visit delete_path(model_name: 'player', id: @player.id) }.to raise_error(CanCan::AccessDenied)
     end
-
   end
 
   describe 'with history role' do
     it 'shows links to history action' do
-
       @user.update_attributes(roles: [:admin, :read_player, :history_player])
       @player = FactoryGirl.create :player
 
diff --git a/spec/integration/authorization/cancancan_spec.rb b/spec/integration/authorization/cancancan_spec.rb
index 603c4d586b..4ee99ed26b 100644
--- a/spec/integration/authorization/cancancan_spec.rb
+++ b/spec/integration/authorization/cancancan_spec.rb
@@ -40,7 +40,6 @@ def initialize(user)
 end
 
 describe 'RailsAdmin CanCanCan Authorization', type: :request do
-
   subject { page }
 
   before do
@@ -111,7 +110,6 @@ def initialize(user)
     it 'GET /admin/player/new should raise CanCan::AccessDenied' do
       expect { visit new_path(model_name: 'player') }.to raise_error(CanCan::AccessDenied)
     end
-
   end
 
   describe 'with create and read player role' do
@@ -143,7 +141,6 @@ def initialize(user)
       @player = FactoryGirl.create :player
       expect { visit edit_path(model_name: 'player', id: @player.id) }.to raise_error(CanCan::AccessDenied)
     end
-
   end
 
   describe 'with update and read player role' do
@@ -175,12 +172,10 @@ def initialize(user)
       @player = FactoryGirl.create :player
       expect { visit delete_path(model_name: 'player', id: @player.id) }.to raise_error(CanCan::AccessDenied)
     end
-
   end
 
   describe 'with history role' do
     it 'shows links to history action' do
-
       @user.update_attributes(roles: [:admin, :read_player, :history_player])
       @player = FactoryGirl.create :player
 
diff --git a/spec/integration/basic/bulk_action/rails_admin_basic_bulk_action_spec.rb b/spec/integration/basic/bulk_action/rails_admin_basic_bulk_action_spec.rb
index 032dde513c..2466a8aee1 100644
--- a/spec/integration/basic/bulk_action/rails_admin_basic_bulk_action_spec.rb
+++ b/spec/integration/basic/bulk_action/rails_admin_basic_bulk_action_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'RailsAdmin Basic Bulk Action', type: :request do
-
   subject { page }
 
   before do
diff --git a/spec/integration/basic/create/rails_admin_namespaced_model_create_spec.rb b/spec/integration/basic/create/rails_admin_namespaced_model_create_spec.rb
index 670fd2495b..e0a0460633 100644
--- a/spec/integration/basic/create/rails_admin_namespaced_model_create_spec.rb
+++ b/spec/integration/basic/create/rails_admin_namespaced_model_create_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'RailsAdmin Namespaced Model Create', type: :request do
-
   subject { page }
 
   it 'creates object with correct attributes' do
diff --git a/spec/integration/basic/delete/rails_admin_basic_delete_spec.rb b/spec/integration/basic/delete/rails_admin_basic_delete_spec.rb
index 08ff154b98..cc43cd17df 100644
--- a/spec/integration/basic/delete/rails_admin_basic_delete_spec.rb
+++ b/spec/integration/basic/delete/rails_admin_basic_delete_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'RailsAdmin Basic Delete', type: :request do
-
   subject { page }
 
   describe 'delete' do
diff --git a/spec/integration/basic/destroy/rails_admin_basic_destroy_spec.rb b/spec/integration/basic/destroy/rails_admin_basic_destroy_spec.rb
index 79f02d0fbf..e4c48abed9 100644
--- a/spec/integration/basic/destroy/rails_admin_basic_destroy_spec.rb
+++ b/spec/integration/basic/destroy/rails_admin_basic_destroy_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'RailsAdmin Basic Destroy', type: :request do
-
   subject { page }
 
   describe 'destroy' do
diff --git a/spec/integration/basic/edit/rails_admin_basic_edit_spec.rb b/spec/integration/basic/edit/rails_admin_basic_edit_spec.rb
index 32db45008c..0ba0b01266 100644
--- a/spec/integration/basic/edit/rails_admin_basic_edit_spec.rb
+++ b/spec/integration/basic/edit/rails_admin_basic_edit_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'RailsAdmin Basic Edit', type: :request do
-
   subject { page }
 
   describe 'edit' do
@@ -41,7 +40,6 @@
   end
 
   describe 'readonly associations' do
-
     it 'is not editable' do
       @league = FactoryGirl.create :league
       visit edit_path(model_name: 'league', id: @league.id)
@@ -102,11 +100,9 @@
     it 'displays a link to the delete page' do
       is_expected.to have_selector "a[href='/admin/ball/#{@ball.id}/delete']"
     end
-
   end
 
   describe 'clicking cancel when editing an object' do
-
     it 'sends back to previous URL' do
       @ball = FactoryGirl.create :ball
       visit '/admin/ball?sort=color'
diff --git a/spec/integration/basic/export/rails_admin_basic_export_spec.rb b/spec/integration/basic/export/rails_admin_basic_export_spec.rb
index 028fa9f81c..8ce7f06f75 100644
--- a/spec/integration/basic/export/rails_admin_basic_export_spec.rb
+++ b/spec/integration/basic/export/rails_admin_basic_export_spec.rb
@@ -2,7 +2,6 @@
 require 'csv'
 
 describe 'RailsAdmin Export', type: :request do
-
   subject { page }
 
   before do
@@ -29,7 +28,6 @@
   end
 
   describe 'POST /admin/players/export (prompt)' do
-
     it 'allows to export to CSV with associations and default schema, containing properly translated header and follow configuration' do
       RailsAdmin.config do |c|
         c.model Player do
diff --git a/spec/integration/basic/list/rails_admin_basic_list_spec.rb b/spec/integration/basic/list/rails_admin_basic_list_spec.rb
index 87185d342e..3aa5dbed16 100644
--- a/spec/integration/basic/list/rails_admin_basic_list_spec.rb
+++ b/spec/integration/basic/list/rails_admin_basic_list_spec.rb
@@ -3,7 +3,6 @@
 require 'spec_helper'
 
 describe 'RailsAdmin Basic List', type: :request do
-
   subject { page }
 
   describe 'GET /admin' do
@@ -437,7 +436,6 @@
       is_expected.to have_selector("td a[href='/admin/ball/#{@ball.id}/edit']")
       is_expected.to have_selector("td a[href='/admin/ball/#{@ball.id}/delete']")
     end
-
   end
 
   describe 'Scopes' do
diff --git a/spec/integration/basic/new/rails_admin_basic_new_spec.rb b/spec/integration/basic/new/rails_admin_basic_new_spec.rb
index 5cc39b9ec1..94dc9d0a4f 100644
--- a/spec/integration/basic/new/rails_admin_basic_new_spec.rb
+++ b/spec/integration/basic/new/rails_admin_basic_new_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'RailsAdmin Basic New', type: :request do
-
   subject { page }
 
   describe 'GET /admin/player/new' do
diff --git a/spec/integration/basic/new/rails_admin_namespaced_model_new_spec.rb b/spec/integration/basic/new/rails_admin_namespaced_model_new_spec.rb
index 7a0ad8e893..5f71e51c87 100644
--- a/spec/integration/basic/new/rails_admin_namespaced_model_new_spec.rb
+++ b/spec/integration/basic/new/rails_admin_namespaced_model_new_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'RailsAdmin Namespaced Model New', type: :request do
-
   subject { page }
 
   describe 'AbstractModel#to_param' do
diff --git a/spec/integration/basic/update/rails_admin_basic_update_spec.rb b/spec/integration/basic/update/rails_admin_basic_update_spec.rb
index 7be4f5073a..ae200ea5b3 100644
--- a/spec/integration/basic/update/rails_admin_basic_update_spec.rb
+++ b/spec/integration/basic/update/rails_admin_basic_update_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'RailsAdmin Basic Update', type: :request do
-
   subject { page }
 
   describe 'update with errors' do
@@ -225,5 +224,4 @@
       expect(@hardball.color).to eq('cyan')
     end
   end
-
 end
diff --git a/spec/integration/config/edit/rails_admin_config_edit_spec.rb b/spec/integration/config/edit/rails_admin_config_edit_spec.rb
index c73127939d..2bf471dea1 100644
--- a/spec/integration/config/edit/rails_admin_config_edit_spec.rb
+++ b/spec/integration/config/edit/rails_admin_config_edit_spec.rb
@@ -3,11 +3,9 @@
 require 'spec_helper'
 
 describe 'RailsAdmin Config DSL Edit Section', type: :request do
-
   subject { page }
 
   describe " a field with 'format' as a name (Kernel function)" do
-
     it 'is updatable without any error' do
       RailsAdmin.config FieldTest do
         edit do
@@ -23,12 +21,10 @@
   end
 
   describe 'default_value' do
-
     it 'is set for all types of input fields' do
       RailsAdmin.config do |config|
         config.excluded_models = []
         config.model(FieldTest) do
-
           field :string_field do
             default_value 'string_field default_value'
           end
@@ -77,7 +73,6 @@
   end
 
   describe 'field groupings' do
-
     it 'is hideable' do
       RailsAdmin.config Team do
         edit do
@@ -326,7 +321,6 @@ class HelpTest < Tableless
   end
 
   describe "items' fields" do
-
     it 'shows all by default' do
       visit new_path(model_name: 'team')
       is_expected.to have_selector('select#team_division_id')
@@ -643,7 +637,6 @@ class HelpTest < Tableless
       is_expected.to have_selector('a', text: 'Edit this Team')
       is_expected.to have_selector('a', text: 'Edit this Draft')
     end
-
   end
 
   describe 'bindings' do
@@ -766,7 +759,6 @@ class HelpTest < Tableless
         expect(page.body).to_not include('field_test_nested_field_tests_attributes_new_nested_field_tests_deeply_nested_field_tests_attributes_new_deeply_nested_field_tests_nested_field_test_id_field')
         expect(page.body).to include('field_test_nested_field_tests_attributes_new_nested_field_tests_deeply_nested_field_tests_attributes_new_deeply_nested_field_tests_title')
       end
-
     end
   end
 
@@ -785,7 +777,6 @@ class HelpTest < Tableless
   end
 
   describe 'fields which are nullable and have AR validations', active_record: true do
-
     it 'is required' do
       # draft.notes is nullable and has no validation
       field = RailsAdmin.config('Draft').edit.fields.detect { |f| f.name == :notes }
@@ -864,7 +855,6 @@ class HelpTest < Tableless
   end
 
   describe 'Paperclip Support' do
-
     it 'shows a file upload field' do
       RailsAdmin.config User do
         edit do
@@ -1071,5 +1061,4 @@ def color_enum
       is_expected.to have_selector('.color_type input')
     end
   end
-
 end
diff --git a/spec/integration/config/list/rails_admin_config_list_spec.rb b/spec/integration/config/list/rails_admin_config_list_spec.rb
index 0fd776c97a..67082e01bc 100644
--- a/spec/integration/config/list/rails_admin_config_list_spec.rb
+++ b/spec/integration/config/list/rails_admin_config_list_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'RailsAdmin Config DSL List Section', type: :request do
-
   subject { page }
 
   describe 'css hooks' do
@@ -19,7 +18,6 @@
   end
 
   describe 'number of items per page' do
-
     before do
       2.times.each do
         FactoryGirl.create :league
@@ -41,7 +39,6 @@
   end
 
   describe "items' fields" do
-
     it 'shows all by default' do
       visit index_path(model_name: 'fan')
       expect(all('th').collect(&:text).delete_if { |t| /^\n*$/ =~ t }).
diff --git a/spec/integration/config/show/rails_admin_config_show_spec.rb b/spec/integration/config/show/rails_admin_config_show_spec.rb
index d889cd2ce5..9b9ca54ed5 100644
--- a/spec/integration/config/show/rails_admin_config_show_spec.rb
+++ b/spec/integration/config/show/rails_admin_config_show_spec.rb
@@ -27,7 +27,6 @@ def do_request
   end
 
   describe 'compact_show_view' do
-
     it 'hides empty fields in show view by default' do
       do_request
       is_expected.not_to have_css('.logo_url_field')
diff --git a/spec/integration/history/rails_admin_history_spec.rb b/spec/integration/history/rails_admin_history_spec.rb
index 83ab43bd1c..de8d3fa35e 100644
--- a/spec/integration/history/rails_admin_history_spec.rb
+++ b/spec/integration/history/rails_admin_history_spec.rb
@@ -84,5 +84,4 @@
       end
     end
   end
-
 end
diff --git a/spec/integration/rails_admin_spec.rb b/spec/integration/rails_admin_spec.rb
index f71d7ab148..5d8ebd0f96 100644
--- a/spec/integration/rails_admin_spec.rb
+++ b/spec/integration/rails_admin_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe RailsAdmin, type: :request do
-
   subject { page }
 
   before do
@@ -41,7 +40,6 @@
   end
 
   describe 'hidden fields with default values' do
-
     before do
       RailsAdmin.config Player do
         include_all_fields
@@ -71,9 +69,7 @@
   end
 
   describe '_current_user' do # https://github.com/sferik/rails_admin/issues/549
-
     it 'is accessible from the list view' do
-
       RailsAdmin.config Player do
         list do
           field :name do
diff --git a/spec/integration/relation_spec.rb b/spec/integration/relation_spec.rb
index bafefc4aed..0d360996b6 100644
--- a/spec/integration/relation_spec.rb
+++ b/spec/integration/relation_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe 'table relations', type: :request do
-
   before do
     class RelTest < Tableless
       column :league_id, :integer
diff --git a/spec/rails_admin/abstract_model_spec.rb b/spec/rails_admin/abstract_model_spec.rb
index d5f772fb88..7de5eff523 100644
--- a/spec/rails_admin/abstract_model_spec.rb
+++ b/spec/rails_admin/abstract_model_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe RailsAdmin::AbstractModel do
-
   describe '#to_s' do
     it 'returns model\'s name' do
       expect(RailsAdmin::AbstractModel.new(Cms::BasicPage).to_s).to eq Cms::BasicPage.to_s
@@ -31,7 +30,6 @@
         expect(@abstract_model.all(filters: {'date_field' => {'1' => {v: ['', '01/03/2012', ''], o: 'between'}}}).count).to eq(2)
         expect(@abstract_model.all(filters: {'date_field' => {'1' => {v: ['', '', '01/02/2012'], o: 'between'}}}).count).to eq(2)
         expect(@abstract_model.all(filters: {'date_field' => {'1' => {v: ['01/02/2012'], o: 'default'}}}).count).to eq(1)
-
       end
     end
 
diff --git a/spec/rails_admin/config/actions/base_spec.rb b/spec/rails_admin/config/actions/base_spec.rb
index 4fbad9beeb..c9ca49fecc 100644
--- a/spec/rails_admin/config/actions/base_spec.rb
+++ b/spec/rails_admin/config/actions/base_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe RailsAdmin::Config::Actions::Base do
-
   describe '#visible?' do
     it 'excludes models not referenced in the only array' do
       RailsAdmin.config do |config|
diff --git a/spec/rails_admin/config/actions_spec.rb b/spec/rails_admin/config/actions_spec.rb
index 2b520c1529..65f8731162 100644
--- a/spec/rails_admin/config/actions_spec.rb
+++ b/spec/rails_admin/config/actions_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe RailsAdmin::Config::Actions do
-
   describe 'default' do
     it 'is as before' do
       expect(RailsAdmin::Config::Actions.all.collect(&:key)).to eq([:dashboard, :index, :show, :new, :edit, :export, :delete, :bulk_delete, :history_show, :history_index, :show_in_app])
diff --git a/spec/rails_admin/config/fields/base_spec.rb b/spec/rails_admin/config/fields/base_spec.rb
index 02a42f2bf1..1c12cadd4e 100644
--- a/spec/rails_admin/config/fields/base_spec.rb
+++ b/spec/rails_admin/config/fields/base_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe RailsAdmin::Config::Fields::Base do
-
   describe '#required' do
     it 'reads the on: :create/:update validate option' do
       RailsAdmin.config Ball do
@@ -197,7 +196,6 @@ class CommentReversed < Tableless
     end
 
     describe 'for basic type fields' do
-
       it 'uses base table and find correct column type' do
         expect(RailsAdmin.config(FieldTest).fields.detect { |f| f.name == :text_field }.searchable_columns).to eq([{column: 'field_tests.text_field', type: :text}])
         expect(RailsAdmin.config(FieldTest).fields.detect { |f| f.name == :integer_field }.searchable_columns).to eq([{column: 'field_tests.integer_field', type: :integer}])
diff --git a/spec/rails_admin/config/fields/types/json_spec.rb b/spec/rails_admin/config/fields/types/json_spec.rb
index e9a763a375..bb8eadf534 100644
--- a/spec/rails_admin/config/fields/types/json_spec.rb
+++ b/spec/rails_admin/config/fields/types/json_spec.rb
@@ -19,6 +19,5 @@
     it 'raise JSON::ParserError with invalid json string' do
       expect { field.parse_input(json_field: '{{') }.to raise_error(JSON::ParserError)
     end
-
   end
 end
diff --git a/spec/rails_admin/config/has_fields_spec.rb b/spec/rails_admin/config/has_fields_spec.rb
index a1bf2225c5..f303aed5a2 100644
--- a/spec/rails_admin/config/has_fields_spec.rb
+++ b/spec/rails_admin/config/has_fields_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe RailsAdmin::Config::HasFields do
-
   it 'shows hidden fields when added through the DSL' do
     expect(RailsAdmin.config(Team).fields.detect { |f| f.name == :division_id }).not_to be_visible
 
diff --git a/spec/rails_admin/config/model_spec.rb b/spec/rails_admin/config/model_spec.rb
index 3bb109bc54..ddec6837d9 100644
--- a/spec/rails_admin/config/model_spec.rb
+++ b/spec/rails_admin/config/model_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe RailsAdmin::Config::Model do
-
   describe '#excluded?' do
     before do
       RailsAdmin.config do |config|
@@ -92,7 +91,6 @@
                                               end,
                                             },
                                           }
-
         end
 
         it 'always uses :other as pluralization key' do
diff --git a/spec/rails_admin/config/sections_spec.rb b/spec/rails_admin/config/sections_spec.rb
index 9c25aa0b5f..39079dc7ac 100644
--- a/spec/rails_admin/config/sections_spec.rb
+++ b/spec/rails_admin/config/sections_spec.rb
@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe RailsAdmin::Config::Sections do
-
   describe 'configure' do
     it 'configures without changing the section default list' do
       RailsAdmin.config Team do
@@ -62,7 +61,6 @@
             end
           end
         end
-
       end
       expect(RailsAdmin.config(Fan).visible_fields.count).to eq(1)
       expect(RailsAdmin.config(Fan).visible_fields.first.label).to eq('modified base Their Name')
diff --git a/spec/rails_admin/config_spec.rb b/spec/rails_admin/config_spec.rb
index 2eddf16004..d261fdb492 100644
--- a/spec/rails_admin/config_spec.rb
+++ b/spec/rails_admin/config_spec.rb
@@ -1,9 +1,7 @@
 require 'spec_helper'
 
 describe RailsAdmin::Config do
-
   describe '.included_models' do
-
     it 'only uses included models' do
       RailsAdmin.config.included_models = [Team, League]
       expect(RailsAdmin::AbstractModel.all.collect(&:model)).to eq([League, Team]) # it gets sorted
@@ -76,7 +74,6 @@
   end
 
   describe '.main_app_name' do
-
     it 'as a default meaningful dynamic value' do
       expect(RailsAdmin.config.main_app_name.call).to eq(['Dummy App', 'Admin'])
     end

From fc2d883e5e62fc590eb9ec015820700f4d488298 Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Sun, 14 Dec 2014 23:51:52 +0100
Subject: [PATCH 42/87] Bump version to 0.6.6

---
 lib/rails_admin/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/rails_admin/version.rb b/lib/rails_admin/version.rb
index 5440d2cbce..d855ffe4df 100644
--- a/lib/rails_admin/version.rb
+++ b/lib/rails_admin/version.rb
@@ -2,7 +2,7 @@ module RailsAdmin
   class Version
     MAJOR = 0
     MINOR = 6
-    PATCH = 5
+    PATCH = 6
     PRE = nil
 
     class << self

From f8f3e026960272d00cae50b2d7293e25d849cc02 Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Tue, 16 Dec 2014 11:55:48 +0900
Subject: [PATCH 43/87] Exclude dummy_app/tmp from Rubocop target

---
 .rubocop.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.rubocop.yml b/.rubocop.yml
index 2dbdcfeabf..73234088a5 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -3,6 +3,7 @@ inherit_from: .rubocop_todo.yml
 AllCops:
   Exclude:
     - 'spec/dummy_app/db/schema.rb'
+    - 'spec/dummy_app/tmp/**/*'
     - 'vendor/bundle/**/*'
 
 Metrics/AbcSize:

From 698f06a8f45c7c56038e9f6d442c9cbfb4065dfe Mon Sep 17 00:00:00 2001
From: Ian Zabel <ian@thoughtbot.com>
Date: Wed, 24 Dec 2014 13:43:51 -0500
Subject: [PATCH 44/87] Rails 4.2 has deprecated `serialized_attributes`

* Use the new `type_for_attribute` method instead
---
 lib/rails_admin/adapters/active_record/property.rb   | 12 +++++++++++-
 .../config/edit/rails_admin_config_edit_spec.rb      |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/lib/rails_admin/adapters/active_record/property.rb b/lib/rails_admin/adapters/active_record/property.rb
index 1d526a1893..4c4dfa230b 100644
--- a/lib/rails_admin/adapters/active_record/property.rb
+++ b/lib/rails_admin/adapters/active_record/property.rb
@@ -18,7 +18,7 @@ def pretty_name
         end
 
         def type
-          if model.serialized_attributes[property.name.to_s]
+          if serialized?
             :serialized
           else
             property.type
@@ -44,6 +44,16 @@ def association?
         def read_only?
           false
         end
+
+      private
+
+        def serialized?
+          if Rails.version < '4.2'
+            model.serialized_attributes[property.name.to_s]
+          else
+            model.type_for_attribute(property.name).class == ::ActiveRecord::Type::Serialized
+          end
+        end
       end
     end
   end
diff --git a/spec/integration/config/edit/rails_admin_config_edit_spec.rb b/spec/integration/config/edit/rails_admin_config_edit_spec.rb
index 2bf471dea1..c30d050fc6 100644
--- a/spec/integration/config/edit/rails_admin_config_edit_spec.rb
+++ b/spec/integration/config/edit/rails_admin_config_edit_spec.rb
@@ -1017,7 +1017,7 @@ def color_enum
       end
 
       after do
-        Team.serialized_attributes.clear
+        Team.serialized_attributes.clear if Rails.version < '4.2'
         Team.instance_eval { undef :color_enum }
       end
 

From 1366d0f322e353efeb2f3e88fe4a278066caf7ff Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Fri, 26 Dec 2014 16:58:43 +0900
Subject: [PATCH 45/87] Remove order dependency

---
 .../config/edit/rails_admin_config_edit_spec.rb            | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/spec/integration/config/edit/rails_admin_config_edit_spec.rb b/spec/integration/config/edit/rails_admin_config_edit_spec.rb
index c30d050fc6..42885d7f92 100644
--- a/spec/integration/config/edit/rails_admin_config_edit_spec.rb
+++ b/spec/integration/config/edit/rails_admin_config_edit_spec.rb
@@ -1017,7 +1017,12 @@ def color_enum
       end
 
       after do
-        Team.serialized_attributes.clear if Rails.version < '4.2'
+        if Rails.version >= '4.2'
+          Team.reset_column_information
+          Team.attribute_type_decorations.clear
+        else
+          Team.serialized_attributes.clear
+        end
         Team.instance_eval { undef :color_enum }
       end
 

From 18ae72faff09127a592ab1a8d828c14abea3c5bd Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Fri, 26 Dec 2014 17:39:41 +0900
Subject: [PATCH 46/87] Fix deprecations in DummyApp

---
 spec/dummy_app/bin/rails                      |  2 +-
 spec/dummy_app/bin/setup                      | 29 ++++++++++++++
 spec/dummy_app/config/application.rb          |  5 ++-
 spec/dummy_app/config/boot.rb                 |  5 +--
 .../config/environments/development.rb        | 14 ++++++-
 .../config/environments/production.rb         | 39 +++++++++----------
 spec/dummy_app/config/environments/test.rb    | 10 ++++-
 spec/dummy_app/config/initializers/assets.rb  | 11 ++++++
 .../config/initializers/cookies_serializer.rb |  3 ++
 .../config/initializers/inflections.rb        |  2 +-
 .../config/initializers/mime_types.rb         |  1 -
 spec/dummy_app/config/secrets.yml             | 22 +++++++++++
 ...000000000001_create_divisions_migration.rb |  2 +-
 .../00000000000002_create_drafts_migration.rb |  2 +-
 ...00000000000003_create_leagues_migration.rb |  2 +-
 ...00000000000004_create_players_migration.rb |  2 +-
 .../00000000000005_create_teams_migration.rb  |  2 +-
 .../00000000000006_devise_create_users.rb     |  2 +-
 .../00000000000007_create_histories_table.rb  |  2 +-
 .../00000000000008_create_fans_migration.rb   |  2 +-
 .../20101223222233_create_rel_tests.rb        |  2 +-
 .../migrate/20110103205808_create_comments.rb |  2 +-
 .../20110224184303_create_field_tests.rb      |  2 +-
 .../20110328193014_create_cms_basic_pages.rb  |  2 +-
 .../db/migrate/20110714095433_create_balls.rb |  2 +-
 ...10901131551_change_division_primary_key.rb |  4 +-
 ..._set_primary_key_not_null_for_divisions.rb |  4 +-
 ...0111123092549_create_nested_field_tests.rb |  2 +-
 .../migrate/20111215083258_create_foo_bars.rb |  2 +-
 .../migrate/20120319041705_drop_rel_tests.rb  |  2 +-
 ...120720075608_create_another_field_tests.rb |  2 +-
 .../migrate/20120928075608_create_images.rb   |  2 +-
 ...075608_create_deeply_nested_field_tests.rb |  2 +-
 ...20140826093220_create_paper_trail_tests.rb |  2 +-
 34 files changed, 135 insertions(+), 56 deletions(-)
 create mode 100755 spec/dummy_app/bin/setup
 create mode 100644 spec/dummy_app/config/initializers/assets.rb
 create mode 100644 spec/dummy_app/config/initializers/cookies_serializer.rb
 create mode 100644 spec/dummy_app/config/secrets.yml

diff --git a/spec/dummy_app/bin/rails b/spec/dummy_app/bin/rails
index 728cd85aa5..5191e6927a 100755
--- a/spec/dummy_app/bin/rails
+++ b/spec/dummy_app/bin/rails
@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
 require_relative '../config/boot'
 require 'rails/commands'
diff --git a/spec/dummy_app/bin/setup b/spec/dummy_app/bin/setup
new file mode 100755
index 0000000000..acdb2c1389
--- /dev/null
+++ b/spec/dummy_app/bin/setup
@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+
+# path to your application root.
+APP_ROOT = Pathname.new File.expand_path('../../',  __FILE__)
+
+Dir.chdir APP_ROOT do
+  # This script is a starting point to setup your application.
+  # Add necessary setup steps to this file:
+
+  puts "== Installing dependencies =="
+  system "gem install bundler --conservative"
+  system "bundle check || bundle install"
+
+  # puts "\n== Copying sample files =="
+  # unless File.exist?("config/database.yml")
+  #   system "cp config/database.yml.sample config/database.yml"
+  # end
+
+  puts "\n== Preparing database =="
+  system "bin/rake db:setup"
+
+  puts "\n== Removing old logs and tempfiles =="
+  system "rm -f log/*"
+  system "rm -rf tmp/cache"
+
+  puts "\n== Restarting application server =="
+  system "touch tmp/restart.txt"
+end
diff --git a/spec/dummy_app/config/application.rb b/spec/dummy_app/config/application.rb
index 0759206956..24c0a9adc8 100644
--- a/spec/dummy_app/config/application.rb
+++ b/spec/dummy_app/config/application.rb
@@ -11,7 +11,7 @@
 
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
-Bundler.require(:default, Rails.env)
+Bundler.require(*Rails.groups)
 
 module DummyApp
   class Application < Rails::Application
@@ -28,5 +28,8 @@ class Application < Rails::Application
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     config.i18n.load_path += Dir[Rails.root.join('app', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
+
+    # Do not swallow errors in after_commit/after_rollback callbacks.
+    config.active_record.raise_in_transactional_callbacks = true if Rails.version >= '4.2'
   end
 end
diff --git a/spec/dummy_app/config/boot.rb b/spec/dummy_app/config/boot.rb
index e7f8ee3953..8e888c88d4 100644
--- a/spec/dummy_app/config/boot.rb
+++ b/spec/dummy_app/config/boot.rb
@@ -1,7 +1,4 @@
 CI_ORM = (ENV['CI_ORM'] || :active_record).to_sym unless defined?(CI_ORM)
-require 'rubygems'
-
-# Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) && !ENV['TRAVIS']
+require 'bundler/setup' # Set up gems listed in the Gemfile.
diff --git a/spec/dummy_app/config/environments/development.rb b/spec/dummy_app/config/environments/development.rb
index f3795da922..289935bfba 100644
--- a/spec/dummy_app/config/environments/development.rb
+++ b/spec/dummy_app/config/environments/development.rb
@@ -19,11 +19,23 @@
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log
 
-  # Raise an error on page load if there are pending migrations
+  # Raise an error on page load if there are pending migrations.
   config.active_record.migration_error = :page_load
 
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
   config.assets.debug = true
+
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
+  config.assets.digest = true
+
+  # Adds additional error checking when serving assets at runtime.
+  # Checks for improperly declared sprockets dependencies.
+  # Raises helpful error messages.
+  config.assets.raise_runtime_errors = true
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end
diff --git a/spec/dummy_app/config/environments/production.rb b/spec/dummy_app/config/environments/production.rb
index 97d72fc474..048a61f11d 100644
--- a/spec/dummy_app/config/environments/production.rb
+++ b/spec/dummy_app/config/environments/production.rb
@@ -5,7 +5,7 @@
   config.cache_classes = true
 
   # Eager load code on boot. This eager loads most of Rails and
-  # your application in memory, allowing both thread web servers
+  # your application in memory, allowing both threaded web servers
   # and those relying on copy on write to perform better.
   # Rake tasks automatically ignore this option for performance.
   config.eager_load = true
@@ -16,11 +16,13 @@
 
   # Enable Rack::Cache to put a simple HTTP cache in front of your application
   # Add `rack-cache` to your Gemfile before enabling this.
-  # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid.
+  # For large-scale production use, consider using a caching reverse proxy like
+  # NGINX, varnish or squid.
   # config.action_dispatch.rack_cache = true
 
-  # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_assets = false
+  # Disable serving static files from the `/public` folder by default since
+  # Apache or NGINX already handles this.
+  config.serve_static_files = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier
@@ -29,21 +31,22 @@
   # Do not fallback to assets pipeline if a precompiled asset is missed.
   config.assets.compile = false
 
-  # Generate digests for assets URLs.
+  # Asset digests allow you to set far-future HTTP expiration dates on all assets,
+  # yet still be able to expire them through the digest params.
   config.assets.digest = true
 
-  # Version of your assets, change this if you want to expire all your assets.
-  config.assets.version = '1.0'
+  # `config.assets.precompile` and `config.assets.version` have moved to config/initializers/assets.rb
 
   # Specifies the header that your server uses for sending files.
-  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
-  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
+  # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
 
-  # Set to :debug to see everything in the log.
-  config.log_level = :info
+  # Use the lowest log level to ensure availability of diagnostic information
+  # when problems arise.
+  config.log_level = :debug
 
   # Prepend all log lines with the following tags.
   # config.log_tags = [ :subdomain, :uuid ]
@@ -55,28 +58,22 @@
   # config.cache_store = :mem_cache_store
 
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
-  # config.action_controller.asset_host = "http://assets.example.com"
-
-  # Precompile additional assets.
-  # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-  # config.assets.precompile += %w(search.js)
+  # config.action_controller.asset_host = 'http://assets.example.com'
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.
   # config.action_mailer.raise_delivery_errors = false
 
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
-  # the I18n.default_locale when a translation can not be found).
+  # the I18n.default_locale when a translation cannot be found).
   config.i18n.fallbacks = true
 
   # Send deprecation notices to registered listeners.
   config.active_support.deprecation = :notify
 
-  # Disable automatic flushing of the log to improve performance.
-  # config.autoflush_log = false
-
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
 
-  config.logger = Logger.new(STDOUT)
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false
 end
diff --git a/spec/dummy_app/config/environments/test.rb b/spec/dummy_app/config/environments/test.rb
index bea20703ba..334c215c20 100644
--- a/spec/dummy_app/config/environments/test.rb
+++ b/spec/dummy_app/config/environments/test.rb
@@ -12,8 +12,8 @@
   # preloads Rails for running tests, you may have to set it to true.
   config.eager_load = false
 
-  # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_assets  = true
+  # Configure static file server for tests with Cache-Control for performance.
+  config.serve_static_files   = true
   config.static_cache_control = 'public, max-age=3600'
 
   # Show full error reports and disable caching.
@@ -31,6 +31,12 @@
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
+  # Randomize the order test cases are executed.
+  config.active_support.test_order = :random
+
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+
+  # Raises error for missing translations
+  # config.action_view.raise_on_missing_translations = true
 end
diff --git a/spec/dummy_app/config/initializers/assets.rb b/spec/dummy_app/config/initializers/assets.rb
new file mode 100644
index 0000000000..01ef3e6630
--- /dev/null
+++ b/spec/dummy_app/config/initializers/assets.rb
@@ -0,0 +1,11 @@
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Add additional assets to the asset load path
+# Rails.application.config.assets.paths << Emoji.images_path
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
+# Rails.application.config.assets.precompile += %w( search.js )
diff --git a/spec/dummy_app/config/initializers/cookies_serializer.rb b/spec/dummy_app/config/initializers/cookies_serializer.rb
new file mode 100644
index 0000000000..ac5f8b663d
--- /dev/null
+++ b/spec/dummy_app/config/initializers/cookies_serializer.rb
@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.action_dispatch.cookies_serializer = :marshal
diff --git a/spec/dummy_app/config/initializers/inflections.rb b/spec/dummy_app/config/initializers/inflections.rb
index 66413b6f11..ac033bf9dc 100644
--- a/spec/dummy_app/config/initializers/inflections.rb
+++ b/spec/dummy_app/config/initializers/inflections.rb
@@ -7,7 +7,7 @@
 #   inflect.plural /^(ox)$/i, '\1en'
 #   inflect.singular /^(ox)en/i, '\1'
 #   inflect.irregular 'person', 'people'
-#   inflect.uncountable %w(fish sheep)
+#   inflect.uncountable %w( fish sheep )
 # end
 
 # These inflection rules are supported but not enabled by default:
diff --git a/spec/dummy_app/config/initializers/mime_types.rb b/spec/dummy_app/config/initializers/mime_types.rb
index 72aca7e441..dc1899682b 100644
--- a/spec/dummy_app/config/initializers/mime_types.rb
+++ b/spec/dummy_app/config/initializers/mime_types.rb
@@ -2,4 +2,3 @@
 
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
-# Mime::Type.register_alias "text/html", :iphone
diff --git a/spec/dummy_app/config/secrets.yml b/spec/dummy_app/config/secrets.yml
new file mode 100644
index 0000000000..3b056c1f6d
--- /dev/null
+++ b/spec/dummy_app/config/secrets.yml
@@ -0,0 +1,22 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key is used for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+# You can use `rake secret` to generate a secure secret key.
+
+# Make sure the secrets in this file are kept private
+# if you're sharing your code publicly.
+
+development:
+  secret_key_base: fe661de3f58b9d446d992466c6e623394828bb6a0af4853bdef9de6ac17b847f418c2aa5778afa4af7b34906df5075e4d5dc6f4b61def924b7ae58f886608770
+
+test:
+  secret_key_base: 3bc2c7ebeb21e93fd8cb1166ae0cdb560c2fa8417e5dd016f691765b5e5a455f53841c01906dfd3b779beed3ad5062be664426001cf9e54ec0874c273a8e64eb
+
+# Do not keep production secrets in the repository,
+# instead read values from the environment.
+production:
+  secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
diff --git a/spec/dummy_app/db/migrate/00000000000001_create_divisions_migration.rb b/spec/dummy_app/db/migrate/00000000000001_create_divisions_migration.rb
index f5124529b9..52cdc7a279 100644
--- a/spec/dummy_app/db/migrate/00000000000001_create_divisions_migration.rb
+++ b/spec/dummy_app/db/migrate/00000000000001_create_divisions_migration.rb
@@ -1,7 +1,7 @@
 class CreateDivisionsMigration < ActiveRecord::Migration
   def self.up
     create_table :divisions do |t|
-      t.timestamps
+      t.timestamps null: false
       t.integer :league_id
       t.string :name, limit: 50, null: false
     end
diff --git a/spec/dummy_app/db/migrate/00000000000002_create_drafts_migration.rb b/spec/dummy_app/db/migrate/00000000000002_create_drafts_migration.rb
index f19a1ecb8a..efe34f9a14 100644
--- a/spec/dummy_app/db/migrate/00000000000002_create_drafts_migration.rb
+++ b/spec/dummy_app/db/migrate/00000000000002_create_drafts_migration.rb
@@ -1,7 +1,7 @@
 class CreateDraftsMigration < ActiveRecord::Migration
   def self.up
     create_table :drafts do |t|
-      t.timestamps
+      t.timestamps null: false
       t.integer :player_id
       t.integer :team_id
       t.date :date
diff --git a/spec/dummy_app/db/migrate/00000000000003_create_leagues_migration.rb b/spec/dummy_app/db/migrate/00000000000003_create_leagues_migration.rb
index fa88e7c24d..230f7be866 100644
--- a/spec/dummy_app/db/migrate/00000000000003_create_leagues_migration.rb
+++ b/spec/dummy_app/db/migrate/00000000000003_create_leagues_migration.rb
@@ -1,7 +1,7 @@
 class CreateLeaguesMigration < ActiveRecord::Migration
   def self.up
     create_table :leagues do |t|
-      t.timestamps
+      t.timestamps null: false
       t.string :name, limit: 50, null: false
     end
   end
diff --git a/spec/dummy_app/db/migrate/00000000000004_create_players_migration.rb b/spec/dummy_app/db/migrate/00000000000004_create_players_migration.rb
index b702470d79..ac4f047911 100644
--- a/spec/dummy_app/db/migrate/00000000000004_create_players_migration.rb
+++ b/spec/dummy_app/db/migrate/00000000000004_create_players_migration.rb
@@ -1,7 +1,7 @@
 class CreatePlayersMigration < ActiveRecord::Migration
   def self.up
     create_table :players do |t|
-      t.timestamps
+      t.timestamps null: false
       t.datetime :deleted_at
       t.integer :team_id
       t.string :name, limit: 100, null: false
diff --git a/spec/dummy_app/db/migrate/00000000000005_create_teams_migration.rb b/spec/dummy_app/db/migrate/00000000000005_create_teams_migration.rb
index 08e359dd1e..6bdfd38aa0 100644
--- a/spec/dummy_app/db/migrate/00000000000005_create_teams_migration.rb
+++ b/spec/dummy_app/db/migrate/00000000000005_create_teams_migration.rb
@@ -1,7 +1,7 @@
 class CreateTeamsMigration < ActiveRecord::Migration
   def self.up
     create_table :teams do |t|
-      t.timestamps
+      t.timestamps null: false
       t.integer :league_id
       t.integer :division_id
       t.string :name, limit: 50
diff --git a/spec/dummy_app/db/migrate/00000000000006_devise_create_users.rb b/spec/dummy_app/db/migrate/00000000000006_devise_create_users.rb
index 48523623a3..f993bb5312 100644
--- a/spec/dummy_app/db/migrate/00000000000006_devise_create_users.rb
+++ b/spec/dummy_app/db/migrate/00000000000006_devise_create_users.rb
@@ -36,7 +36,7 @@ def self.up
       # Token authenticatable
       # t.string :authentication_token
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     add_index :users, :email, unique: true
diff --git a/spec/dummy_app/db/migrate/00000000000007_create_histories_table.rb b/spec/dummy_app/db/migrate/00000000000007_create_histories_table.rb
index 19b6c2ac95..cae3d442e7 100644
--- a/spec/dummy_app/db/migrate/00000000000007_create_histories_table.rb
+++ b/spec/dummy_app/db/migrate/00000000000007_create_histories_table.rb
@@ -5,7 +5,7 @@ def self.up
       t.string :username
       t.integer :item
       t.string :table
-      t.timestamps
+      t.timestamps null: false
     end
     add_index(:histories, [:item, :table])
   end
diff --git a/spec/dummy_app/db/migrate/00000000000008_create_fans_migration.rb b/spec/dummy_app/db/migrate/00000000000008_create_fans_migration.rb
index f2ff01e036..d16f953740 100644
--- a/spec/dummy_app/db/migrate/00000000000008_create_fans_migration.rb
+++ b/spec/dummy_app/db/migrate/00000000000008_create_fans_migration.rb
@@ -1,7 +1,7 @@
 class CreateFansMigration < ActiveRecord::Migration
   def self.up
     create_table :fans do |t|
-      t.timestamps
+      t.timestamps null: false
       t.string :name, limit: 100, null: false
     end
   end
diff --git a/spec/dummy_app/db/migrate/20101223222233_create_rel_tests.rb b/spec/dummy_app/db/migrate/20101223222233_create_rel_tests.rb
index dac6b92fab..4ff7c85b2b 100644
--- a/spec/dummy_app/db/migrate/20101223222233_create_rel_tests.rb
+++ b/spec/dummy_app/db/migrate/20101223222233_create_rel_tests.rb
@@ -5,7 +5,7 @@ def self.up
       t.integer :division_id, null: false
       t.integer :player_id
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 
diff --git a/spec/dummy_app/db/migrate/20110103205808_create_comments.rb b/spec/dummy_app/db/migrate/20110103205808_create_comments.rb
index 7f7c2019c2..8a9f424ea6 100644
--- a/spec/dummy_app/db/migrate/20110103205808_create_comments.rb
+++ b/spec/dummy_app/db/migrate/20110103205808_create_comments.rb
@@ -5,7 +5,7 @@ def self.up
       t.string :commentable_type
       t.text :content
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 
diff --git a/spec/dummy_app/db/migrate/20110224184303_create_field_tests.rb b/spec/dummy_app/db/migrate/20110224184303_create_field_tests.rb
index bd1480ace5..034acf1c1a 100644
--- a/spec/dummy_app/db/migrate/20110224184303_create_field_tests.rb
+++ b/spec/dummy_app/db/migrate/20110224184303_create_field_tests.rb
@@ -12,7 +12,7 @@ def self.up
       t.date :date_field
       t.boolean :boolean_field
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 
diff --git a/spec/dummy_app/db/migrate/20110328193014_create_cms_basic_pages.rb b/spec/dummy_app/db/migrate/20110328193014_create_cms_basic_pages.rb
index aeec5c41ab..1133909a9e 100644
--- a/spec/dummy_app/db/migrate/20110328193014_create_cms_basic_pages.rb
+++ b/spec/dummy_app/db/migrate/20110328193014_create_cms_basic_pages.rb
@@ -4,7 +4,7 @@ def self.up
       t.string :title
       t.text :content
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 
diff --git a/spec/dummy_app/db/migrate/20110714095433_create_balls.rb b/spec/dummy_app/db/migrate/20110714095433_create_balls.rb
index 7cf0f6332b..b75d593d6a 100644
--- a/spec/dummy_app/db/migrate/20110714095433_create_balls.rb
+++ b/spec/dummy_app/db/migrate/20110714095433_create_balls.rb
@@ -2,7 +2,7 @@ class CreateBalls < ActiveRecord::Migration
   def self.up
     create_table :balls, force: true do |t|
       t.string :color
-      t.timestamps
+      t.timestamps null: false
     end
   end
 
diff --git a/spec/dummy_app/db/migrate/20110901131551_change_division_primary_key.rb b/spec/dummy_app/db/migrate/20110901131551_change_division_primary_key.rb
index f3bf64a5b3..9fbed769ae 100644
--- a/spec/dummy_app/db/migrate/20110901131551_change_division_primary_key.rb
+++ b/spec/dummy_app/db/migrate/20110901131551_change_division_primary_key.rb
@@ -2,7 +2,7 @@ class ChangeDivisionPrimaryKey < ActiveRecord::Migration
   def up
     drop_table :divisions
     create_table :divisions, primary_key: 'custom_id' do |t|
-      t.timestamps
+      t.timestamps null: false
       t.integer :league_id
       t.string :name, limit: 50, null: false
     end
@@ -11,7 +11,7 @@ def up
   def down
     drop_table :divisions
     create_table :divisions do |t|
-      t.timestamps
+      t.timestamps null: false
       t.integer :league_id
       t.string :name, limit: 50, null: false
     end
diff --git a/spec/dummy_app/db/migrate/20110901150912_set_primary_key_not_null_for_divisions.rb b/spec/dummy_app/db/migrate/20110901150912_set_primary_key_not_null_for_divisions.rb
index 3776ec8154..a836c60490 100644
--- a/spec/dummy_app/db/migrate/20110901150912_set_primary_key_not_null_for_divisions.rb
+++ b/spec/dummy_app/db/migrate/20110901150912_set_primary_key_not_null_for_divisions.rb
@@ -2,7 +2,7 @@ class SetPrimaryKeyNotNullForDivisions < ActiveRecord::Migration
   def up
     drop_table :divisions
     create_table :divisions, id: false do |t|
-      t.timestamps
+      t.timestamps null: false
       t.primary_key :custom_id
       t.integer :custom_league_id
       t.string :name, limit: 50, null: false
@@ -12,7 +12,7 @@ def up
   def down
     drop_table :divisions
     create_table :divisions, primary_key: :custom_id do |t|
-      t.timestamps
+      t.timestamps null: false
       t.integer :custom_league_id
       t.string :name, limit: 50, null: false
     end
diff --git a/spec/dummy_app/db/migrate/20111123092549_create_nested_field_tests.rb b/spec/dummy_app/db/migrate/20111123092549_create_nested_field_tests.rb
index 4da1e86dcb..fb0f71d225 100644
--- a/spec/dummy_app/db/migrate/20111123092549_create_nested_field_tests.rb
+++ b/spec/dummy_app/db/migrate/20111123092549_create_nested_field_tests.rb
@@ -4,7 +4,7 @@ def change
       t.string :title
       t.integer :field_test_id
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
diff --git a/spec/dummy_app/db/migrate/20111215083258_create_foo_bars.rb b/spec/dummy_app/db/migrate/20111215083258_create_foo_bars.rb
index 9ecafb7e75..5134ce134d 100644
--- a/spec/dummy_app/db/migrate/20111215083258_create_foo_bars.rb
+++ b/spec/dummy_app/db/migrate/20111215083258_create_foo_bars.rb
@@ -2,7 +2,7 @@ class CreateFooBars < ActiveRecord::Migration
   def change
     create_table :foo_bars do |t|
       t.string :title
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
diff --git a/spec/dummy_app/db/migrate/20120319041705_drop_rel_tests.rb b/spec/dummy_app/db/migrate/20120319041705_drop_rel_tests.rb
index 8d24444487..5e64619da0 100644
--- a/spec/dummy_app/db/migrate/20120319041705_drop_rel_tests.rb
+++ b/spec/dummy_app/db/migrate/20120319041705_drop_rel_tests.rb
@@ -9,7 +9,7 @@ def self.down
       t.integer :division_id, null: false
       t.integer :player_id
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
diff --git a/spec/dummy_app/db/migrate/20120720075608_create_another_field_tests.rb b/spec/dummy_app/db/migrate/20120720075608_create_another_field_tests.rb
index 4fd3353c55..6c9db6dc3c 100644
--- a/spec/dummy_app/db/migrate/20120720075608_create_another_field_tests.rb
+++ b/spec/dummy_app/db/migrate/20120720075608_create_another_field_tests.rb
@@ -1,7 +1,7 @@
 class CreateAnotherFieldTests < ActiveRecord::Migration
   def change
     create_table :another_field_tests do |t|
-      t.timestamps
+      t.timestamps null: false
     end
     add_column :nested_field_tests, :another_field_test_id, :integer
   end
diff --git a/spec/dummy_app/db/migrate/20120928075608_create_images.rb b/spec/dummy_app/db/migrate/20120928075608_create_images.rb
index ab13918e5b..ef50e2e276 100644
--- a/spec/dummy_app/db/migrate/20120928075608_create_images.rb
+++ b/spec/dummy_app/db/migrate/20120928075608_create_images.rb
@@ -2,7 +2,7 @@ class CreateImages < ActiveRecord::Migration
   def change
     create_table :images do |t|
       t.attachment :file
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
diff --git a/spec/dummy_app/db/migrate/20140412075608_create_deeply_nested_field_tests.rb b/spec/dummy_app/db/migrate/20140412075608_create_deeply_nested_field_tests.rb
index 0832e6b1f5..d850cb76c1 100644
--- a/spec/dummy_app/db/migrate/20140412075608_create_deeply_nested_field_tests.rb
+++ b/spec/dummy_app/db/migrate/20140412075608_create_deeply_nested_field_tests.rb
@@ -3,7 +3,7 @@ def change
     create_table :deeply_nested_field_tests do |t|
       t.belongs_to :nested_field_test
       t.string :title
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end
diff --git a/spec/dummy_app/db/migrate/20140826093220_create_paper_trail_tests.rb b/spec/dummy_app/db/migrate/20140826093220_create_paper_trail_tests.rb
index 0edf137b1b..4095808bd2 100644
--- a/spec/dummy_app/db/migrate/20140826093220_create_paper_trail_tests.rb
+++ b/spec/dummy_app/db/migrate/20140826093220_create_paper_trail_tests.rb
@@ -3,7 +3,7 @@ def change
     create_table :paper_trail_tests do |t|
       t.string :name
 
-      t.timestamps
+      t.timestamps null: false
     end
   end
 end

From b24ca20de38004f2c7e6f38e0683e7353e620332 Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Fri, 26 Dec 2014 17:52:48 +0900
Subject: [PATCH 47/87] Exclude bin/ from Rubocop target

---
 .rubocop.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.rubocop.yml b/.rubocop.yml
index 73234088a5..d0effcefa8 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -2,6 +2,7 @@ inherit_from: .rubocop_todo.yml
 
 AllCops:
   Exclude:
+    - 'spec/dummy_app/bin/**/*'
     - 'spec/dummy_app/db/schema.rb'
     - 'spec/dummy_app/tmp/**/*'
     - 'vendor/bundle/**/*'

From 444362e504734156318264aeabb17068f8902fa3 Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Fri, 26 Dec 2014 17:59:56 +0900
Subject: [PATCH 48/87] Fix mongoid build error

---
 spec/dummy_app/config/application.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/dummy_app/config/application.rb b/spec/dummy_app/config/application.rb
index 24c0a9adc8..01a7efc2cb 100644
--- a/spec/dummy_app/config/application.rb
+++ b/spec/dummy_app/config/application.rb
@@ -30,6 +30,6 @@ class Application < Rails::Application
     # config.i18n.default_locale = :de
 
     # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true if Rails.version >= '4.2'
+    config.active_record.raise_in_transactional_callbacks = true if Rails.version >= '4.2' && CI_ORM == :active_record
   end
 end

From 78d71104675436150dd74312a6b273078a25d805 Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Mon, 29 Dec 2014 11:52:22 +0900
Subject: [PATCH 49/87] Replace dash to entity reference

Pre-2.0 Rubies do not use UTF-8 source encoding by default
---
 lib/rails_admin/config/fields/types/boolean.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/rails_admin/config/fields/types/boolean.rb b/lib/rails_admin/config/fields/types/boolean.rb
index 3a8ebbd6c8..c7d8dee77e 100644
--- a/lib/rails_admin/config/fields/types/boolean.rb
+++ b/lib/rails_admin/config/fields/types/boolean.rb
@@ -13,7 +13,7 @@ class Boolean < RailsAdmin::Config::Fields::Base
           register_instance_option :pretty_value do
             case value
             when nil
-              %(<span class='label label-default'>‒</span>)
+              %(<span class='label label-default'>&#x2012;</span>)
             when false
               %(<span class='label label-danger'>&#x2718;</span>)
             when true

From 447b6ba7c57ca6e0784c0a918f72e65d32a8751b Mon Sep 17 00:00:00 2001
From: Chris O'Sullivan <thechrisoshow@gmail.com>
Date: Fri, 2 Jan 2015 11:04:22 +0000
Subject: [PATCH 50/87] The datepicker zindex needs to be higher for modals
 Currently if you click on a datepicker in a modal it is hidden behind the
 modal overlay. This commit brings it to the front.

---
 app/assets/stylesheets/rails_admin/ra.calendar-additions.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/rails_admin/ra.calendar-additions.scss b/app/assets/stylesheets/rails_admin/ra.calendar-additions.scss
index 7cd71b3f95..d4c2ec68d4 100644
--- a/app/assets/stylesheets/rails_admin/ra.calendar-additions.scss
+++ b/app/assets/stylesheets/rails_admin/ra.calendar-additions.scss
@@ -6,7 +6,7 @@
 .ui-datepicker {
   /* fix glitches */
   border-width:0px;
-  z-index: 3!important;
+  z-index: 1051!important;
   table{
     margin:0px;
   }

From ba4ea1546fdf8eac1d034048251517424cc16a62 Mon Sep 17 00:00:00 2001
From: Kevin Zych <kzych@devbbq.com>
Date: Tue, 6 Jan 2015 15:34:48 -0500
Subject: [PATCH 51/87] Fix z-index for sidebar-nav z-index bug.

---
 app/assets/stylesheets/rails_admin/base/theming.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/stylesheets/rails_admin/base/theming.scss b/app/assets/stylesheets/rails_admin/base/theming.scss
index 71d61cac8f..ea6e875082 100644
--- a/app/assets/stylesheets/rails_admin/base/theming.scss
+++ b/app/assets/stylesheets/rails_admin/base/theming.scss
@@ -33,6 +33,7 @@ body.rails_admin {
     top: 50px;
     bottom: 0;
     background: #eaf0f1;
+    z-index: 100;
   }
 
   /* fat labels in forms */

From cec0421f1198f0a62854dbabd970eb44059f598f Mon Sep 17 00:00:00 2001
From: Mathew Hartley <me@mathewhartley.com>
Date: Thu, 8 Jan 2015 09:44:21 +1300
Subject: [PATCH 52/87] Allow the font-awesome 4 shim to fail (on FA3).

---
 .../base/font-awesome-4-compability.scss      | 284 +++++++++---------
 1 file changed, 142 insertions(+), 142 deletions(-)

diff --git a/app/assets/stylesheets/rails_admin/base/font-awesome-4-compability.scss b/app/assets/stylesheets/rails_admin/base/font-awesome-4-compability.scss
index 9364f336b8..063e1c7ecb 100644
--- a/app/assets/stylesheets/rails_admin/base/font-awesome-4-compability.scss
+++ b/app/assets/stylesheets/rails_admin/base/font-awesome-4-compability.scss
@@ -1,153 +1,153 @@
 [class^="icon-"],
 [class*=" icon-"] {
-  @extend .fa
+  @extend .fa !optional;
 }
 
-.icon-glass              { @extend .fa-glass; }
-.icon-music              { @extend .fa-music; }
-.icon-search             { @extend .fa-search; }
-.icon-envelope           { @extend .fa-envelope; }
-.icon-heart              { @extend .fa-heart; }
-.icon-star               { @extend .fa-star; }
-.icon-star-empty         { @extend .fa-star-o; }
-.icon-user               { @extend .fa-user; }
-.icon-film               { @extend .fa-film; }
-.icon-th-large           { @extend .fa-th-large; }
-.icon-th                 { @extend .fa-th; }
-.icon-th-list            { @extend .fa-th-list; }
-.icon-ok                 { @extend .fa-check; }
-.icon-remove             { @extend .fa-times; }
-.icon-zoom-in            { @extend .fa-search-plus; }
-.icon-zoom-out           { @extend .fa-search-minus; }
-.icon-off                { @extend .fa-power-off; }
-.icon-signal             { @extend .fa-signal; }
-.icon-cog                { @extend .fa-cog; }
-.icon-trash              { @extend .fa-trash-o; }
+.icon-glass              { @extend .fa-glass !optional; }
+.icon-music              { @extend .fa-music !optional; }
+.icon-search             { @extend .fa-search !optional; }
+.icon-envelope           { @extend .fa-envelope !optional; }
+.icon-heart              { @extend .fa-heart !optional; }
+.icon-star               { @extend .fa-star !optional; }
+.icon-star-empty         { @extend .fa-star-o !optional; }
+.icon-user               { @extend .fa-user !optional; }
+.icon-film               { @extend .fa-film !optional; }
+.icon-th-large           { @extend .fa-th-large !optional; }
+.icon-th                 { @extend .fa-th !optional; }
+.icon-th-list            { @extend .fa-th-list !optional; }
+.icon-ok                 { @extend .fa-check !optional; }
+.icon-remove             { @extend .fa-times !optional; }
+.icon-zoom-in            { @extend .fa-search-plus !optional; }
+.icon-zoom-out           { @extend .fa-search-minus !optional; }
+.icon-off                { @extend .fa-power-off !optional; }
+.icon-signal             { @extend .fa-signal !optional; }
+.icon-cog                { @extend .fa-cog !optional; }
+.icon-trash              { @extend .fa-trash-o !optional; }
 
-.icon-home               { @extend .fa-home; }
-.icon-file               { @extend .fa-file; }
-.icon-time               { @extend .fa-clock-o; }
-.icon-road               { @extend .fa-road; }
-.icon-download-alt       { @extend .fa-download; }
-.icon-download           { @extend .fa-download; }
-.icon-upload             { @extend .fa-upload; }
-.icon-inbox              { @extend .fa-inbox; }
-.icon-play-circle        { @extend .fa-play-circle; }
-.icon-repeat             { @extend .fa-repeat; }
-.icon-refresh            { @extend .fa-refresh; }
-.icon-list-alt           { @extend .fa-list-alt; }
-.icon-lock               { @extend .fa-lock; }
-.icon-flag               { @extend .fa-flag; }
-.icon-headphones         { @extend .fa-headphones; }
-.icon-volume-off         { @extend .fa-volume-off; }
-.icon-volume-down        { @extend .fa-volume-down; }
-.icon-volume-up          { @extend .fa-volume-up; }
-.icon-qrcode             { @extend .fa-qrcode; }
-.icon-barcode            { @extend .fa-barcode; }
+.icon-home               { @extend .fa-home !optional; }
+.icon-file               { @extend .fa-file !optional; }
+.icon-time               { @extend .fa-clock-o !optional; }
+.icon-road               { @extend .fa-road !optional; }
+.icon-download-alt       { @extend .fa-download !optional; }
+.icon-download           { @extend .fa-download !optional; }
+.icon-upload             { @extend .fa-upload !optional; }
+.icon-inbox              { @extend .fa-inbox !optional; }
+.icon-play-circle        { @extend .fa-play-circle !optional; }
+.icon-repeat             { @extend .fa-repeat !optional; }
+.icon-refresh            { @extend .fa-refresh !optional; }
+.icon-list-alt           { @extend .fa-list-alt !optional; }
+.icon-lock               { @extend .fa-lock !optional; }
+.icon-flag               { @extend .fa-flag !optional; }
+.icon-headphones         { @extend .fa-headphones !optional; }
+.icon-volume-off         { @extend .fa-volume-off !optional; }
+.icon-volume-down        { @extend .fa-volume-down !optional; }
+.icon-volume-up          { @extend .fa-volume-up !optional; }
+.icon-qrcode             { @extend .fa-qrcode !optional; }
+.icon-barcode            { @extend .fa-barcode !optional; }
 
-.icon-tag                { @extend .fa-tag; }
-.icon-tags               { @extend .fa-tags; }
-.icon-book               { @extend .fa-book; }
-.icon-bookmark           { @extend .fa-bookmark; }
-.icon-print              { @extend .fa-print; }
-.icon-camera             { @extend .fa-camera; }
-.icon-font               { @extend .fa-font; }
-.icon-bold               { @extend .fa-bold; }
-.icon-italic             { @extend .fa-italic; }
-.icon-text-height        { @extend .fa-text-height; }
-.icon-text-width         { @extend .fa-text-width; }
-.icon-align-left         { @extend .fa-align-left; }
-.icon-align-center       { @extend .fa-align-center; }
-.icon-align-right        { @extend .fa-align-right; }
-.icon-align-justify      { @extend .fa-align-justify; }
-.icon-list               { @extend .fa-list; }
-.icon-indent-left        { @extend .fa-indent; }
-.icon-indent-right       { @extend .fa-dedent; }
-.icon-facetime-video     { @extend .fa-video-camera; }
-.icon-picture            { @extend .fa-picture-o; }
+.icon-tag                { @extend .fa-tag !optional; }
+.icon-tags               { @extend .fa-tags !optional; }
+.icon-book               { @extend .fa-book !optional; }
+.icon-bookmark           { @extend .fa-bookmark !optional; }
+.icon-print              { @extend .fa-print !optional; }
+.icon-camera             { @extend .fa-camera !optional; }
+.icon-font               { @extend .fa-font !optional; }
+.icon-bold               { @extend .fa-bold !optional; }
+.icon-italic             { @extend .fa-italic !optional; }
+.icon-text-height        { @extend .fa-text-height !optional; }
+.icon-text-width         { @extend .fa-text-width !optional; }
+.icon-align-left         { @extend .fa-align-left !optional; }
+.icon-align-center       { @extend .fa-align-center !optional; }
+.icon-align-right        { @extend .fa-align-right !optional; }
+.icon-align-justify      { @extend .fa-align-justify !optional; }
+.icon-list               { @extend .fa-list !optional; }
+.icon-indent-left        { @extend .fa-indent !optional; }
+.icon-indent-right       { @extend .fa-dedent !optional; }
+.icon-facetime-video     { @extend .fa-video-camera !optional; }
+.icon-picture            { @extend .fa-picture-o !optional; }
 
-.icon-pencil             { @extend .fa-pencil; }
-.icon-map-marker         { @extend .fa-map-marker; }
-.icon-adjust             { @extend .fa-adjust; }
-.icon-tint               { @extend .fa-tint; }
-.icon-edit               { @extend .fa-edit; }
-.icon-share              { @extend .fa-share-square-o; }
-.icon-check              { @extend .fa-check; }
-.icon-move               { @extend .fa-arrows; }
-.icon-step-backward      { @extend .fa-step-backward; }
-.icon-fast-backward      { @extend .fa-fast-backward; }
-.icon-backward           { @extend .fa-backward; }
-.icon-play               { @extend .fa-play; }
-.icon-pause              { @extend .fa-pause; }
-.icon-stop               { @extend .fa-stop; }
-.icon-forward            { @extend .fa-forward; }
-.icon-fast-forward       { @extend .fa-fast-forward; }
-.icon-step-forward       { @extend .fa-step-forward; }
-.icon-eject              { @extend .fa-eject; }
-.icon-chevron-left       { @extend .fa-chevron-left; }
-.icon-chevron-right      { @extend .fa-chevron-right; }
+.icon-pencil             { @extend .fa-pencil !optional; }
+.icon-map-marker         { @extend .fa-map-marker !optional; }
+.icon-adjust             { @extend .fa-adjust !optional; }
+.icon-tint               { @extend .fa-tint !optional; }
+.icon-edit               { @extend .fa-edit !optional; }
+.icon-share              { @extend .fa-share-square-o !optional; }
+.icon-check              { @extend .fa-check !optional; }
+.icon-move               { @extend .fa-arrows !optional; }
+.icon-step-backward      { @extend .fa-step-backward !optional; }
+.icon-fast-backward      { @extend .fa-fast-backward !optional; }
+.icon-backward           { @extend .fa-backward !optional; }
+.icon-play               { @extend .fa-play !optional; }
+.icon-pause              { @extend .fa-pause !optional; }
+.icon-stop               { @extend .fa-stop !optional; }
+.icon-forward            { @extend .fa-forward !optional; }
+.icon-fast-forward       { @extend .fa-fast-forward !optional; }
+.icon-step-forward       { @extend .fa-step-forward !optional; }
+.icon-eject              { @extend .fa-eject !optional; }
+.icon-chevron-left       { @extend .fa-chevron-left !optional; }
+.icon-chevron-right      { @extend .fa-chevron-right !optional; }
 
-.icon-plus-sign          { @extend .fa-plus-circle; }
-.icon-minus-sign         { @extend .fa-minus-circle; }
-.icon-remove-sign        { @extend .fa-times-circle; }
-.icon-ok-sign            { @extend .fa-check-circle; }
-.icon-question-sign      { @extend .fa-question-circle; }
-.icon-info-sign          { @extend .fa-info-circle; }
-.icon-screenshot         { @extend .fa-crosshairs; }
-.icon-remove-circle      { @extend .fa-times-circle-o; }
-.icon-ok-circle          { @extend .fa-check-circle-o; }
-.icon-ban-circle         { @extend .fa-ban; }
-.icon-arrow-left         { @extend .fa-arrow-left; }
-.icon-arrow-right        { @extend .fa-arrow-right; }
-.icon-arrow-up           { @extend .fa-arrow-up; }
-.icon-arrow-down         { @extend .fa-arrow-down; }
-.icon-share-alt          { @extend .fa-share; }
-.icon-resize-full        { @extend .fa-expand; }
-.icon-resize-small       { @extend .fa-compress; }
-.icon-plus               { @extend .fa-plus; }
-.icon-minus              { @extend .fa-minus; }
-.icon-asterisk           { @extend .fa-asterisk; }
+.icon-plus-sign          { @extend .fa-plus-circle !optional; }
+.icon-minus-sign         { @extend .fa-minus-circle !optional; }
+.icon-remove-sign        { @extend .fa-times-circle !optional; }
+.icon-ok-sign            { @extend .fa-check-circle !optional; }
+.icon-question-sign      { @extend .fa-question-circle !optional; }
+.icon-info-sign          { @extend .fa-info-circle !optional; }
+.icon-screenshot         { @extend .fa-crosshairs !optional; }
+.icon-remove-circle      { @extend .fa-times-circle-o !optional; }
+.icon-ok-circle          { @extend .fa-check-circle-o !optional; }
+.icon-ban-circle         { @extend .fa-ban !optional; }
+.icon-arrow-left         { @extend .fa-arrow-left !optional; }
+.icon-arrow-right        { @extend .fa-arrow-right !optional; }
+.icon-arrow-up           { @extend .fa-arrow-up !optional; }
+.icon-arrow-down         { @extend .fa-arrow-down !optional; }
+.icon-share-alt          { @extend .fa-share !optional; }
+.icon-resize-full        { @extend .fa-expand !optional; }
+.icon-resize-small       { @extend .fa-compress !optional; }
+.icon-plus               { @extend .fa-plus !optional; }
+.icon-minus              { @extend .fa-minus !optional; }
+.icon-asterisk           { @extend .fa-asterisk !optional; }
 
-.icon-exclamation-sign   { @extend .fa-exclamation-circle; }
-.icon-gift               { @extend .fa-gift; }
-.icon-leaf               { @extend .fa-leaf; }
-.icon-fire               { @extend .fa-fire; }
-.icon-eye-open           { @extend .fa-eye; }
-.icon-eye-close          { @extend .fa-eye-slash; }
-.icon-warning-sign       { @extend .fa-warning; }
-.icon-plane              { @extend .fa-plane; }
-.icon-calendar           { @extend .fa-calendar; }
-.icon-random             { @extend .fa-random; }
-.icon-comment            { @extend .fa-comment; }
-.icon-magnet             { @extend .fa-magnet; }
-.icon-chevron-up         { @extend .fa-chevron-up; }
-.icon-chevron-down       { @extend .fa-chevron-down; }
-.icon-retweet            { @extend .fa-retweet; }
-.icon-shopping-cart      { @extend .fa-shopping-cart; }
-.icon-folder-close       { @extend .fa-folder; }
-.icon-folder-open        { @extend .fa-folder-open; }
-.icon-resize-vertical    { @extend .fa-arrows-v; }
-.icon-resize-horizontal  { @extend .fa-arrows-h; }
+.icon-exclamation-sign   { @extend .fa-exclamation-circle !optional; }
+.icon-gift               { @extend .fa-gift !optional; }
+.icon-leaf               { @extend .fa-leaf !optional; }
+.icon-fire               { @extend .fa-fire !optional; }
+.icon-eye-open           { @extend .fa-eye !optional; }
+.icon-eye-close          { @extend .fa-eye-slash !optional; }
+.icon-warning-sign       { @extend .fa-warning !optional; }
+.icon-plane              { @extend .fa-plane !optional; }
+.icon-calendar           { @extend .fa-calendar !optional; }
+.icon-random             { @extend .fa-random !optional; }
+.icon-comment            { @extend .fa-comment !optional; }
+.icon-magnet             { @extend .fa-magnet !optional; }
+.icon-chevron-up         { @extend .fa-chevron-up !optional; }
+.icon-chevron-down       { @extend .fa-chevron-down !optional; }
+.icon-retweet            { @extend .fa-retweet !optional; }
+.icon-shopping-cart      { @extend .fa-shopping-cart !optional; }
+.icon-folder-close       { @extend .fa-folder !optional; }
+.icon-folder-open        { @extend .fa-folder-open !optional; }
+.icon-resize-vertical    { @extend .fa-arrows-v !optional; }
+.icon-resize-horizontal  { @extend .fa-arrows-h !optional; }
 
-.icon-hdd                { @extend .fa-hdd-o; }
-.icon-bullhorn           { @extend .fa-bullhorn; }
-.icon-bell               { @extend .fa-bell; }
-.icon-certificate        { @extend .fa-certificate; }
-.icon-thumbs-up          { @extend .fa-thumbs-up; }
-.icon-thumbs-down        { @extend .fa-thumbs-down; }
-.icon-hand-right         { @extend .fa-hand-o-right; }
-.icon-hand-left          { @extend .fa-hand-o-left; }
-.icon-hand-up            { @extend .fa-hand-o-up; }
-.icon-hand-down          { @extend .fa-hand-o-down; }
-.icon-circle-arrow-right { @extend .fa-arrow-circle-right; }
-.icon-circle-arrow-left  { @extend .fa-arrow-circle-left; }
-.icon-circle-arrow-up    { @extend .fa-arrow-circle-up; }
-.icon-circle-arrow-down  { @extend .fa-arrow-circle-down; }
-.icon-globe              { @extend .fa-globe; }
-.icon-wrench             { @extend .fa-wrench; }
-.icon-tasks              { @extend .fa-tasks; }
-.icon-filter             { @extend .fa-filter; }
-.icon-briefcase          { @extend .fa-briefcase; }
-.icon-fullscreen         { @extend .fa-arrows-alt; }
+.icon-hdd                { @extend .fa-hdd-o !optional; }
+.icon-bullhorn           { @extend .fa-bullhorn !optional; }
+.icon-bell               { @extend .fa-bell !optional; }
+.icon-certificate        { @extend .fa-certificate !optional; }
+.icon-thumbs-up          { @extend .fa-thumbs-up !optional; }
+.icon-thumbs-down        { @extend .fa-thumbs-down !optional; }
+.icon-hand-right         { @extend .fa-hand-o-right !optional; }
+.icon-hand-left          { @extend .fa-hand-o-left !optional; }
+.icon-hand-up            { @extend .fa-hand-o-up !optional; }
+.icon-hand-down          { @extend .fa-hand-o-down !optional; }
+.icon-circle-arrow-right { @extend .fa-arrow-circle-right !optional; }
+.icon-circle-arrow-left  { @extend .fa-arrow-circle-left !optional; }
+.icon-circle-arrow-up    { @extend .fa-arrow-circle-up !optional; }
+.icon-circle-arrow-down  { @extend .fa-arrow-circle-down !optional; }
+.icon-globe              { @extend .fa-globe !optional; }
+.icon-wrench             { @extend .fa-wrench !optional; }
+.icon-tasks              { @extend .fa-tasks !optional; }
+.icon-filter             { @extend .fa-filter !optional; }
+.icon-briefcase          { @extend .fa-briefcase !optional; }
+.icon-fullscreen         { @extend .fa-arrows-alt !optional; }
 
-.icon-white              { color:white; }
\ No newline at end of file
+.icon-white              { color:white; }

From 0b7eb9261935035b4e5d653cd860344aab9b4651 Mon Sep 17 00:00:00 2001
From: Bret Davidson <bret_davidson@ncsu.edu>
Date: Thu, 8 Jan 2015 16:52:02 -0500
Subject: [PATCH 53/87] Change label-important class to label-danger for
 Bootstrap 3

---
 .../layouts/rails_admin/_secondary_navigation.html.haml      | 2 +-
 spec/integration/rails_admin_spec.rb                         | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/views/layouts/rails_admin/_secondary_navigation.html.haml b/app/views/layouts/rails_admin/_secondary_navigation.html.haml
index 6f70299076..d33817b0ce 100644
--- a/app/views/layouts/rails_admin/_secondary_navigation.html.haml
+++ b/app/views/layouts/rails_admin/_secondary_navigation.html.haml
@@ -7,6 +7,6 @@
     - if user_link = edit_user_link
       %li= user_link
     - if logout_path.present?
-      %li= link_to content_tag('span', t('admin.misc.log_out'), class: 'label label-important'), logout_path, method: logout_method
+      %li= link_to content_tag('span', t('admin.misc.log_out'), class: 'label label-danger'), logout_path, method: logout_method
     - if _current_user.respond_to?(:email) && _current_user.email.present?
       %li= image_tag "#{(request.ssl? ? 'https://secure' : 'http://www')}.gravatar.com/avatar/#{Digest::MD5.hexdigest _current_user.email}?s=30", style: 'padding-top:5px'
diff --git a/spec/integration/rails_admin_spec.rb b/spec/integration/rails_admin_spec.rb
index 5d8ebd0f96..dcc8f522fb 100644
--- a/spec/integration/rails_admin_spec.rb
+++ b/spec/integration/rails_admin_spec.rb
@@ -142,5 +142,10 @@
       visit dashboard_path
       is_expected.to have_content 'Log out'
     end
+
+    it 'has label-danger class on log out link' do
+      visit dashboard_path
+      is_expected.to have_selector('.label-danger')
+    end
   end
 end

From 50a54029c919a16a2175c6fb5d84767f49ada834 Mon Sep 17 00:00:00 2001
From: Chris O'Sullivan <thechrisoshow@gmail.com>
Date: Tue, 30 Dec 2014 11:12:23 +0000
Subject: [PATCH 54/87] Bootstrap 3 uses list-inline for inline lists This
 affects the action icon lists on the dashboard and index pages.

---
 app/assets/stylesheets/rails_admin/base/theming.scss | 2 +-
 app/views/rails_admin/main/dashboard.html.haml       | 2 +-
 app/views/rails_admin/main/index.html.haml           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/stylesheets/rails_admin/base/theming.scss b/app/assets/stylesheets/rails_admin/base/theming.scss
index 71d61cac8f..fa789e801e 100644
--- a/app/assets/stylesheets/rails_admin/base/theming.scss
+++ b/app/assets/stylesheets/rails_admin/base/theming.scss
@@ -269,7 +269,7 @@ body.rails_admin {
     /* icons */
     td.links {
       max-width: none;
-      .inline {
+      .list-inline {
         margin:0px;
         li { display:inline-block; }
       }
diff --git a/app/views/rails_admin/main/dashboard.html.haml b/app/views/rails_admin/main/dashboard.html.haml
index 46f88f41f7..844c1f1e70 100644
--- a/app/views/rails_admin/main/dashboard.html.haml
+++ b/app/views/rails_admin/main/dashboard.html.haml
@@ -27,7 +27,7 @@
                 .progress-bar.animate-width-to{:class => "progress-bar-#{get_indicator(percent)}", :'data-animate-length' => ([1.0, percent].max.to_i * 20), :'data-animate-width-to' => "#{[2.0, percent].max.to_i}%", style: "width:2%"}
                   = @count[abstract_model.pretty_name]
             %td.links
-              %ul.inline= menu_for :collection, abstract_model, nil, true
+              %ul.inline.list-inline= menu_for :collection, abstract_model, nil, true
 - if @auditing_adapter && authorized?(:history)
   #block-tables.block
     .content
diff --git a/app/views/rails_admin/main/index.html.haml b/app/views/rails_admin/main/index.html.haml
index 76bc908ac7..ab7c2bda4b 100644
--- a/app/views/rails_admin/main/index.html.haml
+++ b/app/views/rails_admin/main/index.html.haml
@@ -145,7 +145,7 @@
             - if @other_right_link ||= other_right && index_path(params.merge(set: (params[:set].to_i + 1)))
               %td.other.right= link_to "...", @other_right_link, class: 'pjax'
             %td.last.links
-              %ul.inline= menu_for :member, @abstract_model, object, true
+              %ul.inline.list-inline= menu_for :member, @abstract_model, object, true
     - if @objects.respond_to?(:total_count)
       - total_count = @objects.total_count.to_i
       .row

From 3404dff3d7f4d7f202e6293e70cdf48ffc8abf31 Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Tue, 13 Jan 2015 17:07:57 +0900
Subject: [PATCH 55/87] Fix build

---
 Gemfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5edd3d0002..25d6e5828e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ when '4.2'
   gem 'sass-rails', '~> 5.0.0.beta1'
   gem 'devise', github: 'plataformatec/devise', branch: 'lm-rails-4-2'
 when '4.0'
-  gem 'rails', '~> 4.0.0'
+  gem 'rails', '~> 4.0.1'
   gem 'devise', '>= 3.2'
 else
   gem 'rails', '~> 4.1.0'
@@ -57,7 +57,7 @@ group :test do
   gem 'capybara', '>= 2.1'
   gem 'carrierwave', '>= 0.8'
   gem 'coveralls'
-  gem 'database_cleaner', '>= 1.2'
+  gem 'database_cleaner', ['>= 1.2', '!= 1.4.0']
   gem 'dragonfly', '~> 1.0'
   gem 'factory_girl', '>= 4.2'
   gem 'generator_spec', '>= 0.8'

From bb9d52ae3aef9c6f434c692e593efedbbcb9ce2c Mon Sep 17 00:00:00 2001
From: Rikki Pitt <rikki@studiomohu.com>
Date: Wed, 14 Jan 2015 16:54:46 +0000
Subject: [PATCH 56/87] Fixed history filter input for new Boostrap markup

---
 app/views/rails_admin/main/history.html.haml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/views/rails_admin/main/history.html.haml b/app/views/rails_admin/main/history.html.haml
index 8ebeb2b9e8..dafc5407c6 100644
--- a/app/views/rails_admin/main/history.html.haml
+++ b/app/views/rails_admin/main/history.html.haml
@@ -7,10 +7,12 @@
 
 = form_tag("", method: "get", class: "search pjax-form form-inline") do
   .well
-    %input{name: "query", type: "search", value: query, placeholder: "#{t("admin.misc.filter")}", class: 'input-small'}
-    %button.btn.btn-primary{type: "submit", :'data-disable-with' => "<i class='icon-white icon-refresh'></i> ".html_safe + t("admin.misc.refresh")}
-      %i.icon-white.icon-refresh
-      = t("admin.misc.refresh")
+    .input-group
+      %input.form-control.input-small{name: "query", type: "search", value: query, placeholder: "#{t("admin.misc.filter")}", class: 'input-small'}
+      %span.input-group-btn
+        %button.btn.btn-primary{type: "submit", :'data-disable-with' => "<i class='icon-white icon-refresh'></i> ".html_safe + t("admin.misc.refresh")}
+          %i.icon-white.icon-refresh
+          = t("admin.misc.refresh")
 %table#history.table.table-striped.table-condensed
   %thead
     %tr

From f6d660fae06e97852e61422520e18fb9064f51bd Mon Sep 17 00:00:00 2001
From: Rikki Pitt <rikki@studiomohu.com>
Date: Wed, 14 Jan 2015 17:00:07 +0000
Subject: [PATCH 57/87] Update for the deprecated form-actions class to fix
 submit buttons partial

---
 .../main/_submit_buttons.html.haml            | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/views/rails_admin/main/_submit_buttons.html.haml b/app/views/rails_admin/main/_submit_buttons.html.haml
index c9ed3eff09..4de4eb6ee0 100644
--- a/app/views/rails_admin/main/_submit_buttons.html.haml
+++ b/app/views/rails_admin/main/_submit_buttons.html.haml
@@ -1,16 +1,18 @@
 %input{type: :hidden, name: 'return_to', value: (params[:return_to].presence || request.referer)}
 %br
-.form-actions
-  %button.btn.btn-primary{type: "submit", name: "_save", :'data-disable-with' => t("admin.form.save")}
-    %i.icon-white.icon-ok
-    = t("admin.form.save")
-  %span.extra_buttons
-    - if authorized? :new, @abstract_model
-      %button.btn.btn-info{type: "submit", name: "_add_another", :'data-disable-with' => t("admin.form.save_and_add_another")}
-        = t("admin.form.save_and_add_another")
-    - if authorized? :edit, @abstract_model
-      %button.btn.btn-info{type: "submit", name: "_add_edit", :'data-disable-with' => t("admin.form.save_and_edit")}
-        = t("admin.form.save_and_edit")
-    %button.btn{type: "submit", name: "_continue", :'data-disable-with' => t("admin.form.cancel")}
-      %i.icon-remove
-      = t("admin.form.cancel")
+
+.form-group
+  .col-sm-offset-2.col-sm-10
+    %button.btn.btn-primary{type: "submit", name: "_save", :'data-disable-with' => t("admin.form.save")}
+      %i.icon-white.icon-ok
+      = t("admin.form.save")
+    %span.extra_buttons
+      - if authorized? :new, @abstract_model
+        %button.btn.btn-info{type: "submit", name: "_add_another", :'data-disable-with' => t("admin.form.save_and_add_another")}
+          = t("admin.form.save_and_add_another")
+      - if authorized? :edit, @abstract_model
+        %button.btn.btn-info{type: "submit", name: "_add_edit", :'data-disable-with' => t("admin.form.save_and_edit")}
+          = t("admin.form.save_and_edit")
+      %button.btn{type: "submit", name: "_continue", :'data-disable-with' => t("admin.form.cancel")}
+        %i.icon-remove
+        = t("admin.form.cancel")

From 22c77fac5f7dd1900e556a8edbd359133276a56a Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Thu, 15 Jan 2015 11:24:30 +0900
Subject: [PATCH 58/87] Re-enable navigation Treeview styling

Refs #2059, Fixes #2162
---
 app/assets/stylesheets/rails_admin/base/theming.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/rails_admin/base/theming.scss b/app/assets/stylesheets/rails_admin/base/theming.scss
index 71d61cac8f..daed26f0d8 100644
--- a/app/assets/stylesheets/rails_admin/base/theming.scss
+++ b/app/assets/stylesheets/rails_admin/base/theming.scss
@@ -181,7 +181,7 @@ body.rails_admin {
   // }
 
   /* nested nav */
-  .nav.nav-list {
+  .nav {
     .nav-level-1 {
       padding-left:30px;
     }

From 8c7b33b958f82facf92543786da505181e276972 Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Fri, 16 Jan 2015 11:10:15 +0900
Subject: [PATCH 59/87] Support Postgres jsonb fieldtype. Closes #2165

---
 lib/rails_admin/config/fields/types/json.rb   |  1 +
 .../config/fields/types/json_spec.rb          | 19 ++++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/lib/rails_admin/config/fields/types/json.rb b/lib/rails_admin/config/fields/types/json.rb
index 2415536c52..158adca53b 100644
--- a/lib/rails_admin/config/fields/types/json.rb
+++ b/lib/rails_admin/config/fields/types/json.rb
@@ -7,6 +7,7 @@ module Types
         class Json < RailsAdmin::Config::Fields::Types::Text
           # Register field type for the type loader
           RailsAdmin::Config::Fields::Types.register(self)
+          RailsAdmin::Config::Fields::Types.register(:jsonb, self)
 
           register_instance_option :formatted_value do
             value.present? ? JSON.pretty_generate(value) : nil
diff --git a/spec/rails_admin/config/fields/types/json_spec.rb b/spec/rails_admin/config/fields/types/json_spec.rb
index bb8eadf534..5479dfccda 100644
--- a/spec/rails_admin/config/fields/types/json_spec.rb
+++ b/spec/rails_admin/config/fields/types/json_spec.rb
@@ -1,8 +1,9 @@
 require 'spec_helper'
 
 describe RailsAdmin::Config::Fields::Types::Json do
+  let(:field) { RailsAdmin.config(FieldTest).fields.detect { |f| f.name == :json_field } }
+
   describe '#parse_input' do
-    let(:field) { RailsAdmin.config(FieldTest).fields.detect { |f| f.name == :json_field } }
     before :each do
       RailsAdmin.config do |config|
         config.model FieldTest do
@@ -20,4 +21,20 @@
       expect { field.parse_input(json_field: '{{') }.to raise_error(JSON::ParserError)
     end
   end
+
+  describe 'aliasing' do
+    let(:field) { RailsAdmin.config(FieldTest).fields.detect { |f| f.name == :json_field } }
+
+    before :each do
+      RailsAdmin.config do |config|
+        config.model FieldTest do
+          field :json_field, :jsonb
+        end
+      end
+    end
+
+    it 'allows use of :jsonb fieldtype' do
+      expect(field.class).to eq RailsAdmin::Config::Fields::Types::Json
+    end
+  end
 end

From 414fcd5fefb685c8e52b5e962c276ce8d5cf1c40 Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Fri, 16 Jan 2015 11:20:22 +0900
Subject: [PATCH 60/87] Workaround for bundler dependency resolution failure

https://travis-ci.org/sferik/rails_admin/jobs/47168487
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 25d6e5828e..89ee808829 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ when '4.2'
   gem 'sass-rails', '~> 5.0.0.beta1'
   gem 'devise', github: 'plataformatec/devise', branch: 'lm-rails-4-2'
 when '4.0'
-  gem 'rails', '~> 4.0.1'
+  gem 'rails', '< 4.1'
   gem 'devise', '>= 3.2'
 else
   gem 'rails', '~> 4.1.0'

From c5c53ba7d31ca99b205ddc4645af5ea3ae2c04b6 Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Fri, 16 Jan 2015 11:24:02 +0900
Subject: [PATCH 61/87] Remove redundant let

---
 spec/rails_admin/config/fields/types/json_spec.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/spec/rails_admin/config/fields/types/json_spec.rb b/spec/rails_admin/config/fields/types/json_spec.rb
index 5479dfccda..68fd6e9ded 100644
--- a/spec/rails_admin/config/fields/types/json_spec.rb
+++ b/spec/rails_admin/config/fields/types/json_spec.rb
@@ -23,8 +23,6 @@
   end
 
   describe 'aliasing' do
-    let(:field) { RailsAdmin.config(FieldTest).fields.detect { |f| f.name == :json_field } }
-
     before :each do
       RailsAdmin.config do |config|
         config.model FieldTest do

From 11d90896c2716679b61f66f343e5a2445dc4f7af Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Fri, 16 Jan 2015 12:25:24 +0900
Subject: [PATCH 62/87] Test with Ruby 2.2

---
 .travis.yml | 13 +++++++------
 Gemfile     |  1 +
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 95e65e5607..ef63b6b424 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,6 +22,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1
+  - 2.2
   - rbx-2
   - ruby-head
 
@@ -32,17 +33,17 @@ sudo: false
 
 matrix:
   include:
-    - rvm: 2.1
+    - rvm: 2.2
       env: RAILS_VERSION=4.2 CI_ORM=active_record CI_DB_ADAPTER=sqlite3
-    - rvm: 2.1
+    - rvm: 2.2
       env: RAILS_VERSION=4.2 CI_ORM=mongoid
-    - rvm: 2.1
+    - rvm: 2.2
       env: CI_ORM=active_record CI_DB_ADAPTER=mysql2
-    - rvm: 2.1
+    - rvm: 2.2
       env: CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres
-    - rvm: 2.1
+    - rvm: 2.2
       env: RAILS_VERSION=4.0 CI_ORM=active_record CI_DB_ADAPTER=sqlite3
-    - rvm: 2.1
+    - rvm: 2.2
       env: RAILS_VERSION=4.0 CI_ORM=mongoid
     - rvm: jruby-19mode
       env: CI_ORM=mongoid
diff --git a/Gemfile b/Gemfile
index 89ee808829..a7b5156612 100644
--- a/Gemfile
+++ b/Gemfile
@@ -8,6 +8,7 @@ when '4.2'
 when '4.0'
   gem 'rails', '< 4.1'
   gem 'devise', '>= 3.2'
+  gem 'test-unit'
 else
   gem 'rails', '~> 4.1.0'
   gem 'devise', '>= 3.2'

From c0d9d932ef15895de427ec236a51febc4a2f0d1f Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Fri, 16 Jan 2015 17:15:28 +0900
Subject: [PATCH 63/87] Safeguard for occasional spec failure

https://travis-ci.org/sferik/rails_admin/jobs/47203699
---
 spec/integration/config/edit/rails_admin_config_edit_spec.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spec/integration/config/edit/rails_admin_config_edit_spec.rb b/spec/integration/config/edit/rails_admin_config_edit_spec.rb
index 42885d7f92..88fe18f6d8 100644
--- a/spec/integration/config/edit/rails_admin_config_edit_spec.rb
+++ b/spec/integration/config/edit/rails_admin_config_edit_spec.rb
@@ -674,10 +674,10 @@ class HelpTest < Tableless
       fill_in 'field_test_nested_field_tests_attributes_0_title', with: 'nested field test title 1 edited', visible: false
       find('#field_test_nested_field_tests_attributes_1__destroy', visible: false).set('true')
 
-      click_button 'Save' # first(:button, "Save").click
+      click_button 'Save'
+      is_expected.to have_content('Field test successfully updated')
 
       @record.reload
-
       expect(@record.comment.content.strip).to eq('nested comment content')
       expect(@record.nested_field_tests.length).to eq(1)
       expect(@record.nested_field_tests[0].title).to eq('nested field test title 1 edited')

From 1240bfa68fb924a79b0afcb4f4dc03b2df3cb672 Mon Sep 17 00:00:00 2001
From: krishan1390 <krishan1390@gmail.com>
Date: Tue, 20 Jan 2015 12:09:24 +0530
Subject: [PATCH 64/87] Set required attribute in the html element

Set required attribute in the html element based on the required flag on the field
---
 app/views/rails_admin/main/_form_field.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/rails_admin/main/_form_field.html.haml b/app/views/rails_admin/main/_form_field.html.haml
index 3118b5e42f..df9714826a 100644
--- a/app/views/rails_admin/main/_form_field.html.haml
+++ b/app/views/rails_admin/main/_form_field.html.haml
@@ -1 +1 @@
-= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value, checked: field.form_value.in?([true, '1']), class: 'form-control'})
+= form.send field.view_helper, field.method_name, field.html_attributes.reverse_merge({ value: field.form_value, checked: field.form_value.in?([true, '1']), class: 'form-control', required: field.required})

From e3ef9ea680088c26ec650638ba2e12330a91ed84 Mon Sep 17 00:00:00 2001
From: krishan1390 <krishan1390@gmail.com>
Date: Tue, 20 Jan 2015 12:12:08 +0530
Subject: [PATCH 65/87] Set required attribute in the html text element

Set required attribute in the html text element based on the required flag on the field
---
 app/views/rails_admin/main/_form_text.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/rails_admin/main/_form_text.html.haml b/app/views/rails_admin/main/_form_text.html.haml
index 87ad034532..fafc9b9b50 100644
--- a/app/views/rails_admin/main/_form_text.html.haml
+++ b/app/views/rails_admin/main/_form_text.html.haml
@@ -1 +1 @@
-= form.text_area field.method_name, field.html_attributes.reverse_merge(data: { richtext: false, options: {}.to_json }).reverse_merge({ value: field.form_value, class: 'form-control' })
+= form.text_area field.method_name, field.html_attributes.reverse_merge(data: { richtext: false, options: {}.to_json }).reverse_merge({ value: field.form_value, class: 'form-control', required: field.required })

From dbfcee3e82ecc16f8fd6287dc705e38ad3f5ab87 Mon Sep 17 00:00:00 2001
From: danmatlin <krishan1390@gmail.com>
Date: Wed, 21 Jan 2015 19:46:28 +0530
Subject: [PATCH 66/87] Rspecs for checking required attribute for required
 fields

---
 .../basic/edit/rails_admin_basic_edit_spec.rb            | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/spec/integration/basic/edit/rails_admin_basic_edit_spec.rb b/spec/integration/basic/edit/rails_admin_basic_edit_spec.rb
index 0ba0b01266..91eeb06c95 100644
--- a/spec/integration/basic/edit/rails_admin_basic_edit_spec.rb
+++ b/spec/integration/basic/edit/rails_admin_basic_edit_spec.rb
@@ -23,6 +23,15 @@
       expect(find('#player_born_on_field .help-block')).to have_content('Optional')
       expect(find('#player_notes_field .help-block')).to have_content('Optional')
     end
+    
+    it "checks required fields to have required attribute set" do
+      expect(find_field("player_name")[:required].nil?).to eq(false)
+      expect(find_field("player_number")[:required].nil?).to eq(false)
+    end
+
+    it "checks optional fields to not have required attribute set" do
+      expect(find_field("player_position")[:required].nil?).to eq(true)
+    end
   end
 
   describe 'association with inverse_of option' do

From e3a143e5055d4f5f06b4a3a298612da50dae5b0b Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Thu, 22 Jan 2015 11:31:39 +0900
Subject: [PATCH 67/87] Fix quoting

---
 .../basic/edit/rails_admin_basic_edit_spec.rb        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/spec/integration/basic/edit/rails_admin_basic_edit_spec.rb b/spec/integration/basic/edit/rails_admin_basic_edit_spec.rb
index 91eeb06c95..fe842ef186 100644
--- a/spec/integration/basic/edit/rails_admin_basic_edit_spec.rb
+++ b/spec/integration/basic/edit/rails_admin_basic_edit_spec.rb
@@ -23,14 +23,14 @@
       expect(find('#player_born_on_field .help-block')).to have_content('Optional')
       expect(find('#player_notes_field .help-block')).to have_content('Optional')
     end
-    
-    it "checks required fields to have required attribute set" do
-      expect(find_field("player_name")[:required].nil?).to eq(false)
-      expect(find_field("player_number")[:required].nil?).to eq(false)
+
+    it 'checks required fields to have required attribute set' do
+      expect(find_field('player_name')[:required].nil?).to eq(false)
+      expect(find_field('player_number')[:required].nil?).to eq(false)
     end
 
-    it "checks optional fields to not have required attribute set" do
-      expect(find_field("player_position")[:required].nil?).to eq(true)
+    it 'checks optional fields to not have required attribute set' do
+      expect(find_field('player_position')[:required].nil?).to eq(true)
     end
   end
 

From 10655cbfe972a2972b6580175f8be7fe2e20572c Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Fri, 6 Feb 2015 17:45:01 +0900
Subject: [PATCH 68/87] Disallow access and hide modal links for excluded
 actions. Fixes #2023, Closes #2182

---
 .../rails_admin/application_controller.rb     | 13 ++---
 .../rails_admin/main_controller.rb            |  5 +-
 app/helpers/rails_admin/application_helper.rb |  7 ++-
 lib/rails_admin/config.rb                     |  2 +-
 lib/rails_admin/config/actions/base.rb        | 19 ++++---
 lib/rails_admin/engine.rb                     |  3 ++
 .../rails_admin/application_helper_spec.rb    |  2 +-
 spec/integration/config/actions_spec.rb       | 50 +++++++++++++++++++
 spec/rails_admin/config_spec.rb               |  4 +-
 9 files changed, 78 insertions(+), 27 deletions(-)
 create mode 100644 spec/integration/config/actions_spec.rb

diff --git a/app/controllers/rails_admin/application_controller.rb b/app/controllers/rails_admin/application_controller.rb
index 8aed437db3..2022f466ac 100644
--- a/app/controllers/rails_admin/application_controller.rb
+++ b/app/controllers/rails_admin/application_controller.rb
@@ -7,6 +7,9 @@ class ModelNotFound < ::StandardError
   class ObjectNotFound < ::StandardError
   end
 
+  class ActionNotAllowed < ::StandardError
+  end
+
   class ApplicationController < ::ApplicationController
     newrelic_ignore if defined?(NewRelic)
 
@@ -16,7 +19,7 @@ class ApplicationController < ::ApplicationController
 
     helper_method :_current_user, :_get_plugin_name
 
-    attr_reader :object, :model_config, :abstract_model
+    attr_reader :object, :model_config, :abstract_model, :authorization_adapter
 
     def get_model
       @model_name = to_model_name(params[:model_name])
@@ -68,13 +71,5 @@ def _audit!
       params[:action] = 'dashboard'
       dashboard
     end
-
-    def not_found
-      render file: Rails.root.join('public', '404.html'), layout: false, status: :not_found
-    end
-
-    def rails_admin_controller?
-      true
-    end
   end
 end
diff --git a/app/controllers/rails_admin/main_controller.rb b/app/controllers/rails_admin/main_controller.rb
index 2fc33d848e..16c056429d 100644
--- a/app/controllers/rails_admin/main_controller.rb
+++ b/app/controllers/rails_admin/main_controller.rb
@@ -11,16 +11,17 @@ class MainController < RailsAdmin::ApplicationController
     before_filter :check_for_cancel
 
     RailsAdmin::Config::Actions.all.each do |action|
-      class_eval %{
+      class_eval <<-EOS, __FILE__, __LINE__ + 1
         def #{action.action_name}
           action = RailsAdmin::Config::Actions.find('#{action.action_name}'.to_sym)
           @authorization_adapter.try(:authorize, action.authorization_key, @abstract_model, @object)
           @action = action.with({controller: self, abstract_model: @abstract_model, object: @object})
+          fail(ActionNotAllowed) unless @action.enabled?
           @page_name = wording_for(:title)
 
           instance_eval &@action.controller
         end
-      }
+      EOS
     end
 
     def bulk_action
diff --git a/app/helpers/rails_admin/application_helper.rb b/app/helpers/rails_admin/application_helper.rb
index b664f5ff57..3f12a8e6c6 100644
--- a/app/helpers/rails_admin/application_helper.rb
+++ b/app/helpers/rails_admin/application_helper.rb
@@ -12,9 +12,9 @@ def capitalize_first_letter(wording)
       wording
     end
 
-    def authorized?(action, abstract_model = nil, object = nil)
+    def authorized?(action_name, abstract_model = nil, object = nil)
       object = nil if object.try :new_record?
-      @authorization_adapter.nil? || @authorization_adapter.authorized?(action, abstract_model, object)
+      action(action_name, abstract_model, object).try(:authorized?)
     end
 
     def current_action?(action, abstract_model = @abstract_model, object = @object)
@@ -32,9 +32,8 @@ def actions(scope = :all, abstract_model = nil, object = nil)
     end
 
     def edit_user_link
-      return nil unless authorized?(:edit, _current_user.class, _current_user) && _current_user.respond_to?(:email)
       return nil unless abstract_model = RailsAdmin.config(_current_user.class).abstract_model
-      return nil unless edit_action = RailsAdmin::Config::Actions.find(:edit, controller: controller, abstract_model: abstract_model, object: _current_user)
+      return nil unless (edit_action = RailsAdmin::Config::Actions.find(:edit, controller: controller, abstract_model: abstract_model, object: _current_user)).try(:authorized?)
       link_to _current_user.email, url_for(action: edit_action.action_name, model_name: abstract_model.to_param, id: _current_user.id, controller: 'rails_admin/main')
     end
 
diff --git a/lib/rails_admin/config.rb b/lib/rails_admin/config.rb
index 68ec7c05e7..8cae8dfd70 100644
--- a/lib/rails_admin/config.rb
+++ b/lib/rails_admin/config.rb
@@ -320,7 +320,7 @@ def viable_models
       def visible_models_with_bindings(bindings)
         models.collect { |m| m.with(bindings) }.select do |m|
           m.visible? &&
-            bindings[:controller].authorized?(:index, m.abstract_model) &&
+            RailsAdmin::Config::Actions.find(:index, bindings.merge(abstract_model: m.abstract_model)).try(:authorized?) &&
             (!m.abstract_model.embedded? || m.abstract_model.cyclic?)
         end
       end
diff --git a/lib/rails_admin/config/actions/base.rb b/lib/rails_admin/config/actions/base.rb
index db136d1727..d760425f8f 100644
--- a/lib/rails_admin/config/actions/base.rb
+++ b/lib/rails_admin/config/actions/base.rb
@@ -28,15 +28,18 @@ class Base
           authorized?
         end
 
+        register_instance_option :enabled? do
+          bindings[:abstract_model].nil? || (
+            (only.nil? || [only].flatten.collect(&:to_s).include?(bindings[:abstract_model].to_s)) &&
+            ![except].flatten.collect(&:to_s).include?(bindings[:abstract_model].to_s) &&
+            bindings[:abstract_model].config.with(bindings).visible?
+          )
+        end
+
         register_instance_option :authorized? do
-          (
-            bindings[:controller].nil? || bindings[:controller].authorized?(authorization_key, bindings[:abstract_model], bindings[:object])
-          ) && (
-            bindings[:abstract_model].nil? || (
-              (only.nil? || [only].flatten.collect(&:to_s).include?(bindings[:abstract_model].to_s)) &&
-              ![except].flatten.collect(&:to_s).include?(bindings[:abstract_model].to_s) &&
-              bindings[:abstract_model].config.with(bindings).visible?
-          ))
+          enabled? && (
+            bindings[:controller].try(:authorization_adapter).nil? || bindings[:controller].authorization_adapter.authorized?(authorization_key, bindings[:abstract_model], bindings[:object])
+          )
         end
 
         # Is the action acting on the root level (Example: /admin/contact)
diff --git a/lib/rails_admin/engine.rb b/lib/rails_admin/engine.rb
index 38654ce685..28f9803320 100644
--- a/lib/rails_admin/engine.rb
+++ b/lib/rails_admin/engine.rb
@@ -15,6 +15,9 @@
 module RailsAdmin
   class Engine < Rails::Engine
     isolate_namespace RailsAdmin
+
+    config.action_dispatch.rescue_responses.merge!('RailsAdmin::ActionNotAllowed' => :forbidden)
+
     initializer 'RailsAdmin precompile hook', group: :all do |app|
       app.config.assets.precompile += %w(
         rails_admin/rails_admin.js
diff --git a/spec/helpers/rails_admin/application_helper_spec.rb b/spec/helpers/rails_admin/application_helper_spec.rb
index 1f0827d703..7cd1cc977c 100644
--- a/spec/helpers/rails_admin/application_helper_spec.rb
+++ b/spec/helpers/rails_admin/application_helper_spec.rb
@@ -14,7 +14,7 @@ def initialize(_user)
   describe '#authorized?' do
     before do
       allow(RailsAdmin.config).to receive(:_current_user).and_return(FactoryGirl.create(:user))
-      helper.instance_variable_set('@authorization_adapter', RailsAdmin::AUTHORIZATION_ADAPTERS[:cancan].new(RailsAdmin.config, TestAbility))
+      helper.controller.stub(:authorization_adapter).and_return(RailsAdmin::AUTHORIZATION_ADAPTERS[:cancan].new(RailsAdmin.config, TestAbility))
     end
 
     it 'doesn\'t test unpersisted objects' do
diff --git a/spec/integration/config/actions_spec.rb b/spec/integration/config/actions_spec.rb
new file mode 100644
index 0000000000..4635c1895f
--- /dev/null
+++ b/spec/integration/config/actions_spec.rb
@@ -0,0 +1,50 @@
+# coding: utf-8
+
+require 'spec_helper'
+
+describe 'RailsAdmin Config Action DSL', type: :request do
+  subject { page }
+
+  describe '#enabled?' do
+    it 'prevents the access to unauthorized actions' do
+      RailsAdmin.config do |config|
+        config.actions do
+          index do
+            except %w(FieldTest)
+          end
+        end
+      end
+      expect { visit index_path(model_name: 'field_test') }.to raise_error 'RailsAdmin::ActionNotAllowed'
+    end
+
+    describe 'in form action' do
+      before do
+        RailsAdmin.config do |config|
+          config.actions do
+            index
+            new
+            edit do
+              except %w(Player Team)
+            end
+          end
+        end
+      end
+
+      describe 'for filterling-select widget' do
+        it 'hides modal links to disabled actions' do
+          visit new_path(model_name: 'player')
+          expect(page).to have_link 'Add a new Team'
+          expect(page).not_to have_link 'Edit this Team'
+        end
+      end
+
+      describe 'for filterling-multiselect widget' do
+        it 'hides edit link to another model' do
+          visit new_path(model_name: 'team')
+          expect(page).to have_link 'Add a new Player'
+          expect(page).not_to have_link 'Edit this Player'
+        end
+      end
+    end
+  end
+end
diff --git a/spec/rails_admin/config_spec.rb b/spec/rails_admin/config_spec.rb
index d261fdb492..e04f39148d 100644
--- a/spec/rails_admin/config_spec.rb
+++ b/spec/rails_admin/config_spec.rb
@@ -238,8 +238,8 @@ class Version; end
       RailsAdmin.config do |config|
         config.included_models = [Comment]
       end
-      expect(RailsAdmin.config.visible_models(controller: double(authorized?: true)).collect(&:abstract_model).collect(&:model)).to eq([Comment])
-      expect(RailsAdmin.config.visible_models(controller: double(authorized?: false)).collect(&:abstract_model).collect(&:model)).to eq([])
+      expect(RailsAdmin.config.visible_models(controller: double(authorization_adapter: double(authorized?: true))).collect(&:abstract_model).collect(&:model)).to eq([Comment])
+      expect(RailsAdmin.config.visible_models(controller: double(authorization_adapter: double(authorized?: false))).collect(&:abstract_model).collect(&:model)).to eq([])
     end
 
     it 'does not contain embedded model', mongoid: true do

From 2f4fc32a879ffba19f0bb9e1cbb8b0a078e20c46 Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Fri, 6 Feb 2015 17:50:27 +0900
Subject: [PATCH 69/87] Fix rubocop offenses

---
 lib/rails_admin/config/fields/group.rb                 |  2 +-
 lib/rails_admin/config/fields/types/enum.rb            |  2 +-
 lib/rails_admin/extensions/history/history.rb          | 10 ++++------
 .../adapters/active_record/association_spec.rb         |  2 +-
 spec/rails_admin/config/fields/base_spec.rb            |  2 +-
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/lib/rails_admin/config/fields/group.rb b/lib/rails_admin/config/fields/group.rb
index 87c42424e7..9f2be05570 100644
--- a/lib/rails_admin/config/fields/group.rb
+++ b/lib/rails_admin/config/fields/group.rb
@@ -63,7 +63,7 @@ def visible_fields
 
         # Configurable group label which by default is group's name humanized.
         register_instance_option :label do
-          (@label ||= {})[::I18n.locale] ||= (parent.fields.detect { |f|f.name == name }.try(:label) || name.to_s.humanize)
+          (@label ||= {})[::I18n.locale] ||= (parent.fields.detect { |f| f.name == name }.try(:label) || name.to_s.humanize)
         end
 
         # Configurable help text
diff --git a/lib/rails_admin/config/fields/types/enum.rb b/lib/rails_admin/config/fields/types/enum.rb
index 982285e8bc..b60cf99128 100644
--- a/lib/rails_admin/config/fields/types/enum.rb
+++ b/lib/rails_admin/config/fields/types/enum.rb
@@ -23,7 +23,7 @@ class Enum < RailsAdmin::Config::Fields::Base
             if enum.is_a?(::Hash)
               enum.reject { |_k, v| v.to_s != value.to_s }.keys.first.to_s.presence || value.presence || ' - '
             elsif enum.is_a?(::Array) && enum.first.is_a?(::Array)
-              enum.detect { |e|e[1].to_s == value.to_s }.try(:first).to_s.presence || value.presence || ' - '
+              enum.detect { |e| e[1].to_s == value.to_s }.try(:first).to_s.presence || value.presence || ' - '
             else
               value.presence || ' - '
             end
diff --git a/lib/rails_admin/extensions/history/history.rb b/lib/rails_admin/extensions/history/history.rb
index 39c90dc828..1e96c3b4a3 100644
--- a/lib/rails_admin/extensions/history/history.rb
+++ b/lib/rails_admin/extensions/history/history.rb
@@ -16,12 +16,10 @@ def latest
       end
 
       def create_history_item(message, object, abstract_model, user)
-        create(
-           message: [message].flatten.join(', '),
-           item: object.id,
-           table: abstract_model.to_s,
-           username: user.try(:email),
-         )
+        create(message: [message].flatten.join(', '),
+               item: object.id,
+               table: abstract_model.to_s,
+               username: user.try(:email))
       end
 
       def history_for_model(abstract_model, query, sort, sort_reverse, all, page, per_page = (RailsAdmin::Config.default_items_per_page || 20))
diff --git a/spec/rails_admin/adapters/active_record/association_spec.rb b/spec/rails_admin/adapters/active_record/association_spec.rb
index 60e378e674..c152aaec5d 100644
--- a/spec/rails_admin/adapters/active_record/association_spec.rb
+++ b/spec/rails_admin/adapters/active_record/association_spec.rb
@@ -49,7 +49,7 @@ class ARComment < ActiveRecord::Base
   end
 
   it 'lists associations' do
-    expect(@post.associations.collect { |a|a.name.to_s }).to include(*%w(a_r_blog a_r_categories a_r_comments))
+    expect(@post.associations.collect { |a| a.name.to_s }).to include(*%w(a_r_blog a_r_categories a_r_comments))
   end
 
   it 'list associations types in supported [:belongs_to, :has_and_belongs_to_many, :has_many, :has_one]' do
diff --git a/spec/rails_admin/config/fields/base_spec.rb b/spec/rails_admin/config/fields/base_spec.rb
index 1c12cadd4e..cd501f20fd 100644
--- a/spec/rails_admin/config/fields/base_spec.rb
+++ b/spec/rails_admin/config/fields/base_spec.rb
@@ -359,7 +359,7 @@ class CommentReversed < Tableless
 
   describe '#associated_collection' do
     it 'returns [] when type is blank?' do
-      expect(RailsAdmin.config(Comment).fields.detect { |f|f.name == :commentable }.associated_collection('')).to be_empty
+      expect(RailsAdmin.config(Comment).fields.detect { |f| f.name == :commentable }.associated_collection('')).to be_empty
     end
   end
 

From 558697bf9ec107c9bc2eadf628ceb249962fef0b Mon Sep 17 00:00:00 2001
From: Rikki Pitt <rikkipitt@gmail.com>
Date: Tue, 17 Feb 2015 13:12:59 +0000
Subject: [PATCH 70/87] Updated _submit_buttons.html.haml. Fixes #2181.

---
 app/views/rails_admin/main/_submit_buttons.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/rails_admin/main/_submit_buttons.html.haml b/app/views/rails_admin/main/_submit_buttons.html.haml
index 4de4eb6ee0..c8e4cceaf9 100644
--- a/app/views/rails_admin/main/_submit_buttons.html.haml
+++ b/app/views/rails_admin/main/_submit_buttons.html.haml
@@ -1,7 +1,7 @@
 %input{type: :hidden, name: 'return_to', value: (params[:return_to].presence || request.referer)}
 %br
 
-.form-group
+.form-group.form-actions
   .col-sm-offset-2.col-sm-10
     %button.btn.btn-primary{type: "submit", name: "_save", :'data-disable-with' => t("admin.form.save")}
       %i.icon-white.icon-ok

From 87fe22a9b8995954c3e219e93f696cc4ee3bc49b Mon Sep 17 00:00:00 2001
From: Serge Paquet <spaquet@cortexmedia.ca>
Date: Tue, 17 Feb 2015 16:06:41 -0500
Subject: [PATCH 71/87] Fix form layout on export page

---
 app/views/rails_admin/main/export.html.haml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/rails_admin/main/export.html.haml b/app/views/rails_admin/main/export.html.haml
index 48e9782ca4..a3ac151df2 100644
--- a/app/views/rails_admin/main/export.html.haml
+++ b/app/views/rails_admin/main/export.html.haml
@@ -8,13 +8,13 @@
     %legend
       %i.icon-chevron-down
       = t('admin.export.select')
-    .control-group
+    .form-group.control-group
       .controls
         .col-sm-2
         %label.col-sm-10.checkbox{for: 'check_all'}
           = check_box_tag 'all', 'all', true, { id: 'check_all' }
           = t('admin.export.select_all_fields')
-    .control-group
+    .form-group.control-group
       %label.col-sm-2.control-label{rel: 'tooltip', :'data-original-title' => t('admin.export.click_to_reverse_selection'), onclick: 'jQuery(this).siblings(".controls").find("input").click()'}= t('admin.export.fields_from', name: @model_config.label_plural.downcase)
       .col-sm-10.controls
         - visible_fields.select{ |f| !f.association? || f.association.polymorphic? }.each do |field|
@@ -34,7 +34,7 @@
 
     - visible_fields.select{ |f| f.association? && !f.association.polymorphic? }.each do |field|
       - fields = field.associated_model_config.export.with(controller: self.controller, view: self, object: (associated_model = field.associated_model_config.abstract_model.model).new).visible_fields.select{ |f| !f.association? }
-      .control-group
+      .form-group.control-group
         %label.col-sm-2.control-label{rel: 'tooltip', :'data-original-title' => t('admin.export.click_to_reverse_selection'), onclick: 'jQuery(this).siblings(".controls").find("input").click()'}= t('admin.export.fields_from_associated', name: field.label.downcase)
         .col-sm-10.controls
           - fields.each do |associated_model_field|
@@ -47,7 +47,7 @@
     %legend
       %i.icon-chevron-down
       = t('admin.export.options_for', name: 'csv')
-    .control-group
+    .form-group.control-group
       - guessed_encoding = @abstract_model.encoding
       %label.col-sm-2.control-label{for: "csv_options_encoding_to"}= t('admin.export.csv.encoding_to')
       .col-sm-10.controls
@@ -55,14 +55,14 @@
         = select_tag 'csv_options[encoding_to]', options_for_select(RailsAdmin::CSVConverter::TARGET_ENCODINGS), include_blank: true
         %p.help-block= t('admin.export.csv.encoding_to_help', name: guessed_encoding)
 
-    .control-group
+    .form-group.control-group
       %label.col-sm-2.control-label{for: "csv_options_skip_header"}= t('admin.export.csv.skip_header')
       .col-sm-10.controls
         %label.checkbox
           = check_box_tag 'csv_options[skip_header]', 'true'
         %p.help-block= t('admin.export.csv.skip_header_help')
 
-    .control-group
+    .form-group.control-group
       %label.col-sm-2.control-label{for: "csv_options_generator_col_sep"}= t('admin.export.csv.col_sep')
       .col-sm-10.controls
         = select_tag 'csv_options[generator][col_sep]', options_for_select({ '' => t('admin.export.csv.default_col_sep'), "<comma> ','" => ',', "<semicolon> ';'" => ';', '<tabs>' => "'\t'" })

From 830787fe727fb75b2bbc616132f5be561ebc1f9d Mon Sep 17 00:00:00 2001
From: Matt Campbell <matt@soupmatt.com>
Date: Wed, 25 Feb 2015 17:32:02 -0600
Subject: [PATCH 72/87] Don't .capitalize the Home link name, as it removes
 capitalization

Before this commit
admin.home.name = 'My Cool App' would be rendered 'My cool app'

After this commit
admin.home.name = 'My Cool App' would be rendered 'My Cool App'
---
 app/views/layouts/rails_admin/_secondary_navigation.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/rails_admin/_secondary_navigation.html.haml b/app/views/layouts/rails_admin/_secondary_navigation.html.haml
index d33817b0ce..b67df85d0a 100644
--- a/app/views/layouts/rails_admin/_secondary_navigation.html.haml
+++ b/app/views/layouts/rails_admin/_secondary_navigation.html.haml
@@ -2,7 +2,7 @@
   - actions(:root).each do |action|
     %li{class: "#{action.action_name}_root_link"}= link_to wording_for(:menu, action), { action: action.action_name, controller: 'rails_admin/main' }, class: "pjax"
   - if main_app_root_path = (main_app.root_path rescue false)
-    %li= link_to t('admin.home.name').capitalize, main_app_root_path
+    %li= link_to t('admin.home.name'), main_app_root_path
   - if _current_user
     - if user_link = edit_user_link
       %li= user_link

From fcfd821d7dc26f70a8e7025119b3a45baece186b Mon Sep 17 00:00:00 2001
From: Rikki Pitt <rikkipitt@gmail.com>
Date: Fri, 27 Feb 2015 12:12:53 +0000
Subject: [PATCH 73/87] Fixed label in _delete_notice partial for Bootstrap 3

---
 app/views/rails_admin/main/_delete_notice.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/rails_admin/main/_delete_notice.html.haml b/app/views/rails_admin/main/_delete_notice.html.haml
index c0e573188d..bdd843f836 100644
--- a/app/views/rails_admin/main/_delete_notice.html.haml
+++ b/app/views/rails_admin/main/_delete_notice.html.haml
@@ -1,7 +1,7 @@
 - object = delete_notice
 
 %li{style: 'display:block; margin-top:10px'}
-  %span.label= @abstract_model.pretty_name
+  %span.label.label-default= @abstract_model.pretty_name
   - wording = object.send(@model_config.object_label_method)
   - if show_action = action(:show, @abstract_model, object)
     = link_to(wording, url_for(action: show_action.action_name, model_name: @abstract_model.to_param, id: object.id), class: 'pjax')

From 3020d5249da7fd01b59f3db0134db31fa93d6f3f Mon Sep 17 00:00:00 2001
From: Francesco Rigotti <francesco.rigotti@luganonetwork.ch>
Date: Fri, 6 Mar 2015 16:53:22 +0100
Subject: [PATCH 74/87] Fix indentation issue for nested forms

---
 app/assets/stylesheets/rails_admin/base/theming.scss   | 4 ----
 app/views/rails_admin/main/_form_nested_many.html.haml | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/rails_admin/base/theming.scss b/app/assets/stylesheets/rails_admin/base/theming.scss
index 53be7329e1..650c959d83 100644
--- a/app/assets/stylesheets/rails_admin/base/theming.scss
+++ b/app/assets/stylesheets/rails_admin/base/theming.scss
@@ -117,8 +117,6 @@ body.rails_admin {
       fieldset {
         margin-left:-10px;
         .control-group > label {
-          padding-left:10px;
-          width:135px;
         }
         legend {
           float:left;
@@ -134,8 +132,6 @@ body.rails_admin {
       fieldset {
         margin-left:-20px;
         .control-group > label {
-          padding-left:20px;
-          width:125px;
         }
         legend {
           margin-left:20px;
diff --git a/app/views/rails_admin/main/_form_nested_many.html.haml b/app/views/rails_admin/main/_form_nested_many.html.haml
index af0ec5d01b..55ee0c5149 100644
--- a/app/views/rails_admin/main/_form_nested_many.html.haml
+++ b/app/views/rails_admin/main/_form_nested_many.html.haml
@@ -1,4 +1,4 @@
-.controls{data: { nestedmany: true }}
+.controls.col-md-offset-2{data: { nestedmany: true }}
   .btn-group
     %a.btn.btn-info.toggler{:'data-toggle' => "button", :'data-target' => "#{form.jquery_namespace(field)} > .tab-content, #{form.jquery_namespace(field)} > .controls > .nav", class: (field.active? ? 'active' : '')}
       %i.icon-white

From 6a401eefc848a90c4757baa3178f2bae0cb0a4c3 Mon Sep 17 00:00:00 2001
From: Ohkubo KOHEI <ohkubo@magician.jp>
Date: Sun, 8 Mar 2015 05:31:45 +0900
Subject: [PATCH 75/87] fix target typo 'blank' to '_blank'

---
 lib/rails_admin/config/fields/types/file_upload.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/rails_admin/config/fields/types/file_upload.rb b/lib/rails_admin/config/fields/types/file_upload.rb
index e2197e4001..ebc114ffd5 100644
--- a/lib/rails_admin/config/fields/types/file_upload.rb
+++ b/lib/rails_admin/config/fields/types/file_upload.rb
@@ -35,7 +35,7 @@ class FileUpload < RailsAdmin::Config::Fields::Base
                 thumb_url = resource_url(thumb_method)
                 url != thumb_url ? v.link_to(v.image_tag(thumb_url, class: 'img-polaroid'), url, target: 'blank') : v.image_tag(thumb_url)
               else
-                v.link_to(nil, url, target: 'blank')
+                v.link_to(nil, url, target: '_blank')
               end
             end
           end

From 7811d55a6f6eb17b937f639b1e546039463d86e1 Mon Sep 17 00:00:00 2001
From: Ohkubo KOHEI <ohkubo@magician.jp>
Date: Mon, 9 Mar 2015 14:25:40 +0900
Subject: [PATCH 76/87] fixed another 'blank'

---
 lib/rails_admin/config/fields/types/file_upload.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/rails_admin/config/fields/types/file_upload.rb b/lib/rails_admin/config/fields/types/file_upload.rb
index ebc114ffd5..5eff910117 100644
--- a/lib/rails_admin/config/fields/types/file_upload.rb
+++ b/lib/rails_admin/config/fields/types/file_upload.rb
@@ -33,7 +33,7 @@ class FileUpload < RailsAdmin::Config::Fields::Base
               url = resource_url
               if image
                 thumb_url = resource_url(thumb_method)
-                url != thumb_url ? v.link_to(v.image_tag(thumb_url, class: 'img-polaroid'), url, target: 'blank') : v.image_tag(thumb_url)
+                url != thumb_url ? v.link_to(v.image_tag(thumb_url, class: 'img-polaroid'), url, target: '_blank') : v.image_tag(thumb_url)
               else
                 v.link_to(nil, url, target: '_blank')
               end

From ef910409b58a33f81dc3a89043f135eb93d5ad40 Mon Sep 17 00:00:00 2001
From: Rikki Pitt <rikkipitt@gmail.com>
Date: Mon, 9 Mar 2015 12:16:30 +0000
Subject: [PATCH 77/87] Fix dashboard history authorized check

---
 app/views/rails_admin/main/dashboard.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/rails_admin/main/dashboard.html.haml b/app/views/rails_admin/main/dashboard.html.haml
index 844c1f1e70..7f36a1263b 100644
--- a/app/views/rails_admin/main/dashboard.html.haml
+++ b/app/views/rails_admin/main/dashboard.html.haml
@@ -28,7 +28,7 @@
                   = @count[abstract_model.pretty_name]
             %td.links
               %ul.inline.list-inline= menu_for :collection, abstract_model, nil, true
-- if @auditing_adapter && authorized?(:history)
+- if @auditing_adapter && authorized?(:history_index)
   #block-tables.block
     .content
       %h2= t("admin.actions.history_index.menu")

From 1ba96fe6b7e2eb934eac729060f1b8cd1739e3b5 Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Tue, 10 Mar 2015 11:57:12 +0900
Subject: [PATCH 78/87] See also allow_blank on checking required?. Fixes #2180

---
 lib/rails_admin/config/fields/base.rb                       | 2 +-
 spec/dummy_app/app/active_record/team.rb                    | 2 +-
 .../integration/config/edit/rails_admin_config_edit_spec.rb | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/rails_admin/config/fields/base.rb b/lib/rails_admin/config/fields/base.rb
index 6cb352fa82..f6baedc742 100644
--- a/lib/rails_admin/config/fields/base.rb
+++ b/lib/rails_admin/config/fields/base.rb
@@ -172,7 +172,7 @@ def virtual?
           end
           (@required ||= {})[context] ||= !!([name] + children_fields).uniq.detect do |column_name| # rubocop:disable DoubleNegation
             abstract_model.model.validators_on(column_name).detect do |v|
-              !v.options[:allow_nil] &&
+              !(v.options[:allow_nil] || v.options[:allow_blank]) &&
               [:presence, :numericality, :attachment_presence].include?(v.kind) &&
               (v.options[:on] == context || v.options[:on].blank?)
             end
diff --git a/spec/dummy_app/app/active_record/team.rb b/spec/dummy_app/app/active_record/team.rb
index f5e31c4437..a5508331ed 100644
--- a/spec/dummy_app/app/active_record/team.rb
+++ b/spec/dummy_app/app/active_record/team.rb
@@ -7,7 +7,7 @@ class Team < ActiveRecord::Base
 
   validates_numericality_of :division_id, only_integer: true
   validates_presence_of :manager
-  validates_numericality_of :founded, only_integer: true
+  validates_numericality_of :founded, only_integer: true, allow_blank: true
   validates_numericality_of :wins, only_integer: true
   validates_numericality_of :losses, only_integer: true
   validates_numericality_of :win_percentage
diff --git a/spec/integration/config/edit/rails_admin_config_edit_spec.rb b/spec/integration/config/edit/rails_admin_config_edit_spec.rb
index 88fe18f6d8..8b0b72650c 100644
--- a/spec/integration/config/edit/rails_admin_config_edit_spec.rb
+++ b/spec/integration/config/edit/rails_admin_config_edit_spec.rb
@@ -800,6 +800,12 @@ class HelpTest < Tableless
       field = RailsAdmin.config('Team').edit.fields.detect { |f| f.name == :revenue }
       expect(field.properties.nullable?).to be_truthy
       expect(field.required?).to be_falsey
+
+      # team.founded is nullable in the schema but has an AR
+      # validates_numericality_of validation that allows blank
+      field = RailsAdmin.config('Team').edit.fields.detect { |f| f.name == :founded }
+      expect(field.properties.nullable?).to be_truthy
+      expect(field.required?).to be_falsey
     end
   end
 

From d071c2c687f35a86b11d71a826ae972a1e149358 Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Wed, 11 Mar 2015 16:06:39 +0100
Subject: [PATCH 79/87] Add Ruby 2.2 support to the README [ci skip]

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d5385a8237..28e7e4ffca 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,8 @@ This library aims to support and is [tested against][travis] the following Ruby
 
 * Ruby 1.9.3
 * Ruby 2.0.0
-* Ruby 2.1.1
+* Ruby 2.1
+* Ruby 2.2
 * [Rubinius][]
 * [JRuby][]
 

From f2bc1becb69def928c39f962577c2b24e4c6c031 Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Wed, 11 Mar 2015 16:07:21 +0100
Subject: [PATCH 80/87] Add Mitsuhiro Shibuya as a gem author [ci skip]

---
 rails_admin.gemspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rails_admin.gemspec b/rails_admin.gemspec
index 6cdb598350..ab2ba79353 100644
--- a/rails_admin.gemspec
+++ b/rails_admin.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'safe_yaml', '~> 1.0'
   spec.add_dependency 'sass-rails', ['>= 4.0', '< 6']
   spec.add_development_dependency 'bundler', '~> 1.0'
-  spec.authors = ['Erik Michaels-Ober', 'Bogdan Gaza', 'Petteri Kaapa', 'Benoit Benezech']
+  spec.authors = ['Erik Michaels-Ober', 'Bogdan Gaza', 'Petteri Kaapa', 'Benoit Benezech', 'Mitsuhiro Shibuya']
   spec.description = 'RailsAdmin is a Rails engine that provides an easy-to-use interface for managing your data.'
   spec.email = ['sferik@gmail.com', 'bogdan@cadmio.org', 'petteri.kaapa@gmail.com']
   spec.files = Dir['Gemfile', 'LICENSE.md', 'README.md', 'Rakefile', 'app/**/*', 'config/**/*', 'lib/**/*', 'public/**/*']

From 550a059d58a3b2a39265c47a2f6b4633692bc59a Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Wed, 11 Mar 2015 16:17:02 +0100
Subject: [PATCH 81/87] Change default rails test and development version to
 4.2

---
 .travis.yml | 12 ++++++------
 Gemfile     | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ef63b6b424..564be810b0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,17 +34,17 @@ sudo: false
 matrix:
   include:
     - rvm: 2.2
-      env: RAILS_VERSION=4.2 CI_ORM=active_record CI_DB_ADAPTER=sqlite3
+      env: RAILS_VERSION=4.0 CI_ORM=active_record CI_DB_ADAPTER=sqlite3
     - rvm: 2.2
-      env: RAILS_VERSION=4.2 CI_ORM=mongoid
+      env: RAILS_VERSION=4.0 CI_ORM=mongoid
     - rvm: 2.2
-      env: CI_ORM=active_record CI_DB_ADAPTER=mysql2
+      env: RAILS_VERSION=4.1 CI_ORM=active_record CI_DB_ADAPTER=sqlite3
     - rvm: 2.2
-      env: CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres
+      env: RAILS_VERSION=4.1 CI_ORM=mongoid
     - rvm: 2.2
-      env: RAILS_VERSION=4.0 CI_ORM=active_record CI_DB_ADAPTER=sqlite3
+      env: CI_ORM=active_record CI_DB_ADAPTER=mysql2
     - rvm: 2.2
-      env: RAILS_VERSION=4.0 CI_ORM=mongoid
+      env: CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres
     - rvm: jruby-19mode
       env: CI_ORM=mongoid
     - rvm: jruby-19mode
diff --git a/Gemfile b/Gemfile
index a7b5156612..aaff1002e9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,17 +1,17 @@
 source 'https://rubygems.org'
 
 case ENV['RAILS_VERSION']
-when '4.2'
-  gem 'rails', '~> 4.2.0.beta1'
-  gem 'sass-rails', '~> 5.0.0.beta1'
-  gem 'devise', github: 'plataformatec/devise', branch: 'lm-rails-4-2'
 when '4.0'
-  gem 'rails', '< 4.1'
+  gem 'rails', '~> 4.0.0'
   gem 'devise', '>= 3.2'
   gem 'test-unit'
-else
+when '4.1'
   gem 'rails', '~> 4.1.0'
   gem 'devise', '>= 3.2'
+else
+  gem 'rails', '~> 4.2.0'
+  gem 'sass-rails', '~> 5.0'
+  gem 'devise', github: 'plataformatec/devise', branch: 'lm-rails-4-2'
 end
 
 case ENV['CI_ORM']

From e4db31e7bae8b422cc9fe9b247a7c29483b2c384 Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Fri, 13 Mar 2015 19:40:10 +0900
Subject: [PATCH 82/87] Fix PostgreSQL build

---
 Gemfile                                     |  2 +-
 spec/orm/active_record.rb                   | 24 +++++++++++++++++----
 spec/rails_admin/config/fields/base_spec.rb | 12 +++++------
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index aaff1002e9..aac7dfd300 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ when '4.1'
 else
   gem 'rails', '~> 4.2.0'
   gem 'sass-rails', '~> 5.0'
-  gem 'devise', github: 'plataformatec/devise', branch: 'lm-rails-4-2'
+  gem 'devise', '>= 3.4'
 end
 
 case ENV['CI_ORM']
diff --git a/spec/orm/active_record.rb b/spec/orm/active_record.rb
index d99167f1fc..35b392d4de 100644
--- a/spec/orm/active_record.rb
+++ b/spec/orm/active_record.rb
@@ -18,10 +18,12 @@ def columns
     end
 
     def column(name, sql_type = nil, default = nil, null = true)
-      columns << ActiveRecord::ConnectionAdapters::Column.new(
-        name.to_s, default,
-        connection.respond_to?(:lookup_cast_type) ? connection.lookup_cast_type(sql_type.to_s) : sql_type.to_s,
-        null)
+      columns <<
+        if connection.respond_to?(:lookup_cast_type)
+          ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, connection.lookup_cast_type(sql_type.to_s), sql_type.to_s, null)
+        else
+          ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, sql_type.to_s, null)
+        end
     end
 
     def columns_hash
@@ -45,3 +47,17 @@ def save(validate = true)
     validate ? valid? : true
   end
 end
+
+##
+# Column length detection seems to be broken for PostgreSQL.
+# This is a workaround..
+# Refs. https://github.com/rails/rails/commit/b404613c977a5cc31c6748723e903fa5a0709c3b
+#
+if defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+  ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.class_eval do
+    def lookup_cast_type(sql_type)
+      oid = execute("SELECT #{quote(sql_type)}::regtype::oid", 'SCHEMA').first['oid'].to_i
+      type_map.lookup(oid, sql_type)
+    end
+  end
+end
diff --git a/spec/rails_admin/config/fields/base_spec.rb b/spec/rails_admin/config/fields/base_spec.rb
index cd501f20fd..1f836d59ff 100644
--- a/spec/rails_admin/config/fields/base_spec.rb
+++ b/spec/rails_admin/config/fields/base_spec.rb
@@ -370,12 +370,12 @@ class FieldVisibilityTest < Tableless
         column :_id, :integer
         column :_type, :varchar
         column :name, :varchar
-        column :created_at, :datetime
-        column :updated_at, :datetime
-        column :deleted_at, :datetime
-        column :created_on, :datetime
-        column :updated_on, :datetime
-        column :deleted_on, :datetime
+        column :created_at, :timestamp
+        column :updated_at, :timestamp
+        column :deleted_at, :timestamp
+        column :created_on, :timestamp
+        column :updated_on, :timestamp
+        column :deleted_on, :timestamp
       end
       expect(RailsAdmin.config(FieldVisibilityTest).base.fields.select(&:visible?).collect(&:name)).to match_array [:_id, :created_at, :created_on, :deleted_at, :deleted_on, :id, :name, :updated_at, :updated_on]
       expect(RailsAdmin.config(FieldVisibilityTest).list.fields.select(&:visible?).collect(&:name)).to match_array [:_id, :created_at, :created_on, :deleted_at, :deleted_on, :id, :name, :updated_at, :updated_on]

From 44a564d1f2678a5fb3f49e5b21a37f45f9d09eae Mon Sep 17 00:00:00 2001
From: Daniel254 <Daniel254@yandex.ru>
Date: Fri, 13 Mar 2015 23:27:03 +0200
Subject: [PATCH 83/87] Change view of focused item in select dropdown

Change view of focused item in select dropdown from http://prntscr.com/6gehla to http://prntscr.com/6geg2z
Prevents mooving text when focus in or focus out
---
 .../stylesheets/rails_admin/aristo/jquery-ui-1.8.7.custom.scss  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/rails_admin/aristo/jquery-ui-1.8.7.custom.scss b/app/assets/stylesheets/rails_admin/aristo/jquery-ui-1.8.7.custom.scss
index 3dce16de5f..1bee68ee22 100644
--- a/app/assets/stylesheets/rails_admin/aristo/jquery-ui-1.8.7.custom.scss
+++ b/app/assets/stylesheets/rails_admin/aristo/jquery-ui-1.8.7.custom.scss
@@ -89,7 +89,7 @@
 	box-shadow: 0 1px 0 rgba(255,255,255,0.6) inset;
 }
 .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #4F4F4F; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #9D9D9D; font-weight: normal; color: #313131; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { background-color: #b3e2f0; font-weight: normal; color: #313131; }
 .ui-state-hover a, .ui-state-hover a:hover { color: #313131; text-decoration: none; }
 .ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { 
 	outline: none;

From 280b7cb760d63cf4668ce4d1b2f272aa8f2406ed Mon Sep 17 00:00:00 2001
From: Erik Michaels-Ober <sferik@gmail.com>
Date: Mon, 16 Mar 2015 08:13:25 -0500
Subject: [PATCH 84/87] Bump version to 0.6.7

---
 lib/rails_admin/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/rails_admin/version.rb b/lib/rails_admin/version.rb
index d855ffe4df..ee0fd159f9 100644
--- a/lib/rails_admin/version.rb
+++ b/lib/rails_admin/version.rb
@@ -2,7 +2,7 @@ module RailsAdmin
   class Version
     MAJOR = 0
     MINOR = 6
-    PATCH = 6
+    PATCH = 7
     PRE = nil
 
     class << self

From 03ec916f447d029c8de59c015f386d63d43ceae1 Mon Sep 17 00:00:00 2001
From: MJ <you@example.com>
Date: Sat, 14 Mar 2015 15:20:00 +0800
Subject: [PATCH 85/87] added parent_controller

Conflicts:
	app/controllers/rails_admin/application_controller.rb
	rails_admin.gemspec
---
 .../rails_admin/application_controller.rb           |  2 +-
 lib/rails_admin/config.rb                           |  4 ++++
 spec/rails_admin/config_spec.rb                     | 13 +++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/app/controllers/rails_admin/application_controller.rb b/app/controllers/rails_admin/application_controller.rb
index 2022f466ac..612b53df50 100644
--- a/app/controllers/rails_admin/application_controller.rb
+++ b/app/controllers/rails_admin/application_controller.rb
@@ -10,7 +10,7 @@ class ObjectNotFound < ::StandardError
   class ActionNotAllowed < ::StandardError
   end
 
-  class ApplicationController < ::ApplicationController
+  class ApplicationController < Config.parent_controller.constantize
     newrelic_ignore if defined?(NewRelic)
 
     before_filter :_authenticate!
diff --git a/lib/rails_admin/config.rb b/lib/rails_admin/config.rb
index 8cae8dfd70..c6145f6040 100644
--- a/lib/rails_admin/config.rb
+++ b/lib/rails_admin/config.rb
@@ -53,6 +53,9 @@ class << self
       # Set the max width of columns in list view before a new set is created
       attr_accessor :total_columns_width
 
+      # set parent controller
+      attr_accessor :parent_controller
+
       # Stores model configuration objects in a hash identified by model's class
       # name.
       #
@@ -270,6 +273,7 @@ def reset
         @registry = {}
         @navigation_static_links = {}
         @navigation_static_label = nil
+        @parent_controller = '::ApplicationController'
         RailsAdmin::Config::Actions.reset
       end
 
diff --git a/spec/rails_admin/config_spec.rb b/spec/rails_admin/config_spec.rb
index e04f39148d..a8bee37094 100644
--- a/spec/rails_admin/config_spec.rb
+++ b/spec/rails_admin/config_spec.rb
@@ -271,6 +271,19 @@ class RecursivelyEmbedsMany
       expect(RailsAdmin::Config.models_pool.select { |m| m.match(/^Concerns::/) }).to be_empty
     end
   end
+
+  describe '.parent_controller' do
+    it 'uses default class' do
+      expect(RailsAdmin.config.parent_controller).to eq '::ApplicationController'
+    end
+
+    it 'uses other class' do
+      RailsAdmin.config do |config|
+        config.parent_controller = 'TestController'
+      end
+      expect(RailsAdmin.config.parent_controller).to eq 'TestController'
+    end
+  end
 end
 
 module ExampleModule

From 3b27b4081926a4a7e200ede45728b92a3f096cf1 Mon Sep 17 00:00:00 2001
From: "M.Shibuya" <mit.shibuya@gmail.com>
Date: Wed, 18 Mar 2015 19:29:19 +0900
Subject: [PATCH 86/87] Allow cancel of form with required fields. Fixes #2190

---
 app/assets/javascripts/rails_admin/ui.coffee             | 5 +++++
 app/views/rails_admin/main/_submit_buttons.html.haml     | 2 +-
 .../basic/edit/rails_admin_basic_edit_spec.rb            | 9 ++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/rails_admin/ui.coffee b/app/assets/javascripts/rails_admin/ui.coffee
index 5eb2eb35d2..306d3139d8 100644
--- a/app/assets/javascripts/rails_admin/ui.coffee
+++ b/app/assets/javascripts/rails_admin/ui.coffee
@@ -69,6 +69,11 @@ $(document).on 'rails_admin.dom_ready', ->
 
   $(".table").tooltip selector: "th[rel=tooltip]"
 
+  # Workaround for jquery-ujs formnovalidate issue:
+  # https://github.com/rails/jquery-ujs/issues/316
+  $('[formnovalidate]').on 'click', ->
+    $(this).closest('form').attr('novalidate', true)
+
 $(document).on 'click', '#fields_to_export label input#check_all', () ->
   elems = $('#fields_to_export label input')
   if $('#fields_to_export label input#check_all').is ':checked'
diff --git a/app/views/rails_admin/main/_submit_buttons.html.haml b/app/views/rails_admin/main/_submit_buttons.html.haml
index c8e4cceaf9..555608fab9 100644
--- a/app/views/rails_admin/main/_submit_buttons.html.haml
+++ b/app/views/rails_admin/main/_submit_buttons.html.haml
@@ -13,6 +13,6 @@
       - if authorized? :edit, @abstract_model
         %button.btn.btn-info{type: "submit", name: "_add_edit", :'data-disable-with' => t("admin.form.save_and_edit")}
           = t("admin.form.save_and_edit")
-      %button.btn{type: "submit", name: "_continue", :'data-disable-with' => t("admin.form.cancel")}
+      %button.btn{type: "submit", name: "_continue", :'data-disable-with' => t("admin.form.cancel"), :formnovalidate => true}
         %i.icon-remove
         = t("admin.form.cancel")
diff --git a/spec/integration/basic/edit/rails_admin_basic_edit_spec.rb b/spec/integration/basic/edit/rails_admin_basic_edit_spec.rb
index fe842ef186..7395f5b18b 100644
--- a/spec/integration/basic/edit/rails_admin_basic_edit_spec.rb
+++ b/spec/integration/basic/edit/rails_admin_basic_edit_spec.rb
@@ -112,10 +112,17 @@
   end
 
   describe 'clicking cancel when editing an object' do
-    it 'sends back to previous URL' do
+    before do
       @ball = FactoryGirl.create :ball
       visit '/admin/ball?sort=color'
       click_link 'Edit'
+    end
+
+    it "shows cancel button with 'novalidate' attribute" do
+      expect(page).to have_css '[type="submit"][name="_continue"][formnovalidate]'
+    end
+
+    it 'sends back to previous URL' do
       click_button 'Cancel'
       expect(page.current_url).to eq('http://www.example.com/admin/ball?sort=color')
     end

From 83beb5a87c2cac47fbd8b8980e88c7132a103698 Mon Sep 17 00:00:00 2001
From: Ohkubo KOHEI <ohkubo@magician.jp>
Date: Sat, 28 Mar 2015 10:56:53 +0900
Subject: [PATCH 87/87] fit for bootstrap3 style

---
 .../rails_admin/main/_form_polymorphic_association.html.haml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/rails_admin/main/_form_polymorphic_association.html.haml b/app/views/rails_admin/main/_form_polymorphic_association.html.haml
index 0a880d94d7..65c89694d5 100644
--- a/app/views/rails_admin/main/_form_polymorphic_association.html.haml
+++ b/app/views/rails_admin/main/_form_polymorphic_association.html.haml
@@ -6,5 +6,6 @@
   selected = field.bindings[:object].send(field.association.name)
   column_type_dom_id = form.dom_id(field).sub(field.method_name.to_s, type_column)
 
-= form.select type_column, type_collection, {include_blank: true, selected: selected_type}, id: column_type_dom_id, data: { polymorphic: true, urls: field.polymorphic_type_urls.to_json }
-= form.select field.method_name, collection, {include_blank: true, selected: selected.try(:id)}, style: "margin-left:10px;"
+.form-inline
+= form.select type_column, type_collection, {include_blank: true, selected: selected_type}, class: "form-control", id: column_type_dom_id, data: { polymorphic: true, urls: field.polymorphic_type_urls.to_json }
+= form.select field.method_name, collection, {include_blank: true, selected: selected.try(:id)}, class: "form-control"