merges master and fixes conflicts

config/deploy/staging.rb

@@ -1,7 +1,7 @@
 set :deploy_to, deploysecret(:deploy_to)
 set :server_name, deploysecret(:server_name)
 set :db_server, deploysecret(:db_server)
-set :branch, :master
+set :branch, ENV['branch'] || :master
 set :ssh_options, port: deploysecret(:ssh_port)
 set :stage, :staging
 set :rails_env, :staging

config/initializers/acts_as_taggable_on.rb

@@ -2,7 +2,7 @@ ActsAsTaggableOn::Tagging.class_eval do
   after_destroy :touch_taggable
 
   def touch_taggable
-    taggable.touch
+    taggable.touch if taggable.present?
   end
 
 end

config/initializers/assets.rb

@@ -10,3 +10,4 @@ Rails.application.config.assets.version = '1.0'
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 # Rails.application.config.assets.precompile += %w( search.js )
 Rails.application.config.assets.precompile += %w( ckeditor/* )
+Rails.application.config.assets.precompile += %w( rem.min.js, respond.min.js )

config/locales/verification.en.yml

@@ -83,6 +83,7 @@ en:
           success: "Correct code. Your account is verified"
       alert:
         unconfirmed_code: "You have not yet enter the confirmation code"
+        verify_attemps_left: "You have reached the maximum number of letter verification tries"
     verified_user:
       show:
         title: "Available information"

config/locales/verification.es.yml

@@ -83,6 +83,7 @@ es:
           success: "Código correcto. Tu cuenta ya está verificada"
       alert:
         unconfirmed_code: "Todavía no has introducido el código de confirmación"
+        verify_attemps_left: "Has llegado al máximo número de intentos de verificar tu carta."
     verified_user:
       show:
         title: "Información disponible"