Merged master from upstream, local changes

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.15'
+gem 'rails', '3.2.17'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -8,9 +8,7 @@ gem 'rails', '3.2.15'
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
 #  gem 'coffee-rails', '~> 3.2.1'
-  gem 'bootstrap-sass'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
   gem 'therubyracer', :platforms => :ruby
@@ -22,11 +20,12 @@ group :development, :test do
   gem 'pry'
   gem 'mysql2'
   gem 'thin'
-  gem 'rspec-rails', '2.11.0'
+  gem 'letter_opener'
 end
 
 group :production do
   gem 'mysql2'
+  gem 'rspec-rails', '2.11.0'
 end
 
 group :test do
@@ -38,13 +37,15 @@ gem 'paperclip', '~> 3.0'
 gem 'jquery-rails'
 gem 'jquery-ui-rails'
 gem 'jquery-fileupload-rails'
-gem 'devise', '~> 2.2'
+gem 'devise'
 gem 'cancan'
 gem "haml"
 gem 'bcrypt-ruby', '~> 3.0.0'
 #gem 'node'
 gem 'paper_trail'
 gem 'formtastic-bootstrap'
+gem 'bootstrap-sass'
+gem 'sass-rails', '>= 3.2'
 gem 'cocoon'
 gem 'transitions', :require => ["transitions", "active_record/transitions"]
 gem 'acts_as_commentable_with_threading'
@@ -53,3 +54,4 @@ gem 'prawn_rails'
 gem 'gravtastic'
 gem 'active_model_serializers'
 gem 'axlsx_rails'
+gem 'd3_rails'