merges master and fixes conflicts

.gitignore

@@ -22,3 +22,6 @@
 /config/deploy-secrets.yml
 
 /coverage
+
+# Mac finder artifacts
+.DS_Store

CONTRIBUTING.md

@@ -27,6 +27,7 @@ Cuando quieras resolver una incidencia mediante código:
 * Crea una rama para resolver la incidencia desde la rama `master`
 * Añade el código necesario para resolver la incidencia en tantos commits como sea preciso
 * Asegúrate de que los tests pasan (y escribe más tests para probar la nueva funcionalidad si fuera preciso)
+* Sigue estas [buenas prácticas](https://github.com/styleguide/ruby)
 * Envía una *pull request* al repositorio principal indicando la incidencia que se está arreglando
 
 ## Otras formas de contribuir sin código

CONTRIBUTING_EN.md

@@ -27,6 +27,7 @@ If you want to contribute code to solve an issue:
 * Create a topic branch based on master.
 * Commit there your code to solve the issue.
 * Make sure all test are passing (and add specs to test any new feature if needed).
+* Follow these [best practices](https://github.com/styleguide/ruby)
 * Open a *pull request* to the main repository describing what issue you are addressing.
 
 ## Other ways of contributing without coding

Capfile

@@ -6,9 +6,11 @@ require 'capistrano/deploy'
 
 require 'capistrano/rvm'
 require 'capistrano/bundler'
-require 'capistrano/rails/assets'
+#require 'capistrano/rails/assets'
 require 'capistrano/rails/migrations'
-require 'capistrano/passenger'
+#require 'capistrano/passenger'
 
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }
+Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }
+Dir.glob('lib/capistrano/**/*.rb').each { |r| import r }

Gemfile

@@ -21,14 +21,19 @@ gem 'turbolinks'
 gem 'devise'
 # Use ActiveModel has_secure_password
 # gem 'bcrypt', '~> 3.1.7'
+gem 'kaminari'
 gem 'acts_as_commentable_with_threading'
 gem 'acts-as-taggable-on'
 gem "responders"
 gem 'foundation-rails'
+gem 'foundation_rails_helper'
 gem 'acts_as_votable'
-gem "recaptcha", require: "recaptcha/rails"
+gem 'simple_captcha2', require: 'simple_captcha'
 gem 'ckeditor'
 gem 'cancancan'
+gem 'social-share-button'
+gem 'initialjs-rails'
+gem 'unicorn'
 
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
@@ -48,7 +53,6 @@ group :development, :test do
   gem "capistrano-bundler", '1.1.4',   require: false
   gem "capistrano-rails", '1.1.3',     require: false
   gem "capistrano-rvm",                require: false
-  gem "capistrano-passenger",          require: false
 end
 
 group :test do
@@ -60,4 +64,3 @@ end
 group :test do
   gem 'email_spec'
 end
-

Gemfile.lock

@@ -44,7 +44,7 @@ GEM
       awesome_nested_set (>= 3.0)
     acts_as_votable (0.10.0)
     addressable (2.3.8)
-    arel (6.0.2)
+    arel (6.0.3)
     awesome_nested_set (3.0.2)
       activerecord (>= 4.0.0, < 5)
     bcrypt (3.1.10)
@@ -61,8 +61,6 @@ GEM
     capistrano-bundler (1.1.4)
       capistrano (~> 3.1)
       sshkit (~> 1.2)
-    capistrano-passenger (0.1.1)
-      capistrano (~> 3.0)
     capistrano-rails (1.1.3)
       capistrano (~> 3.1)
       capistrano-bundler (~> 1.1)
@@ -75,7 +73,7 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    ckeditor (4.1.2)
+    ckeditor (4.1.3)
       cocaine
       orm_adapter (~> 0.5.0)
     climate_control (0.0.3)
@@ -100,7 +98,7 @@ GEM
       thor (~> 0.19.1)
     database_cleaner (1.4.1)
     debug_inspector (0.0.2)
-    devise (3.5.1)
+    devise (3.5.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -128,25 +126,37 @@ GEM
     foundation-rails (5.5.2.1)
       railties (>= 3.1.0)
       sass (>= 3.3.0, < 3.5)
-    globalid (0.3.5)
+    foundation_rails_helper (1.0.0)
+      actionpack (~> 4.1, >= 4.1.1)
+      activemodel (~> 4.1, >= 4.1.1)
+      activesupport (~> 4.1, >= 4.1.1)
+      railties (~> 4.1, >= 4.1.1)
+      tzinfo (~> 1.2, >= 1.2.2)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
     highline (1.7.3)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     i18n (0.7.0)
-    i18n-tasks (0.8.6)
-      activesupport
+    i18n-tasks (0.8.7)
+      activesupport (>= 2.3.18)
       easy_translate (>= 0.5.0)
       erubis
-      highline
+      highline (>= 1.7.3)
       i18n
-      term-ansicolor
+      term-ansicolor (>= 1.3.2)
       terminal-table (>= 1.5.1)
+    initialjs-rails (0.1.0)
+      railties (>= 3.1, < 5.0)
     jquery-rails (4.0.4)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
+    kaminari (0.16.3)
+      actionpack (>= 3.0.0)
+      activesupport (>= 3.0.0)
+    kgio (2.9.3)
     launchy (2.4.3)
       addressable (~> 2.3)
     letter_opener (1.4.1)
@@ -160,7 +170,7 @@ GEM
       mime-types (>= 1.16, < 3)
     mime-types (2.6.1)
     mini_portile (0.6.2)
-    minitest (5.7.0)
+    minitest (5.8.0)
     multi_json (1.11.2)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
@@ -204,23 +214,23 @@ GEM
       activesupport (= 4.2.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
+    raindrops (0.15.0)
     rake (10.4.2)
-    recaptcha (0.4.0)
     responders (2.1.0)
       railties (>= 4.2.0, < 5)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
       netrc (~> 0.7)
-    rspec-core (3.3.1)
+    rspec-core (3.3.2)
       rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
+    rspec-expectations (3.3.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.1)
+    rspec-mocks (3.3.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
-    rspec-rails (3.3.2)
+    rspec-rails (3.3.3)
       actionpack (>= 3.0, < 4.3)
       activesupport (>= 3.0, < 4.3)
       railties (>= 3.0, < 4.3)
@@ -236,11 +246,16 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)
+    simple_captcha2 (0.3.4)
+      rails (>= 4.1)
     simplecov (0.10.0)
       docile (~> 1.1.0)
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
+    social-share-button (0.1.8)
+      coffee-rails
+      sass-rails
     spring (1.3.6)
     sprockets (3.2.0)
       rack (~> 1.0)
@@ -270,6 +285,10 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
+    unicorn (4.9.0)
+      kgio (~> 2.6)
+      rack
+      raindrops (~> 0.7)
     warden (1.2.3)
       rack (>= 1.0)
     web-console (2.2.1)
@@ -294,7 +313,6 @@ DEPENDENCIES
   cancancan
   capistrano (= 3.4.0)
   capistrano-bundler (= 1.1.4)
-  capistrano-passenger
   capistrano-rails (= 1.1.3)
   capistrano-rvm
   capybara
@@ -306,21 +324,26 @@ DEPENDENCIES
   email_spec
   factory_girl_rails
   foundation-rails
+  foundation_rails_helper
   i18n-tasks
+  initialjs-rails
   jquery-rails
+  kaminari
   launchy
   letter_opener_web (~> 1.2.0)
   pg
   poltergeist
   quiet_assets
   rails (= 4.2.3)
-  recaptcha
   responders
   rspec-rails (~> 3.0)
   sass-rails (~> 5.0)
+  simple_captcha2
+  social-share-button
   spring
   turbolinks
   uglifier (>= 1.3.0)
+  unicorn
   web-console (~> 2.0)
 
 BUNDLED WITH