merges master and fix conflicts

config/locales/en.yml

@@ -213,6 +213,14 @@ en:
       all: "You are not authorized to %{action} %{subject}."
   welcome:
     last_debates: Last debates
+    welcome:
+      title: Account verification
+      instructions_1_html: "Welcome to the public participation website."
+      instructions_2_html: "We have detected that <b>your email is confirmed but we were not able to verify your citizen data</b>."
+      instructions_3_html: "Without verifying them, <b>you have only partial access to the website</b>. You need to be verified, for example, in order to participate in public proposals."
+      verify_account: "Verify my account now"
+      go_to_index: "I prefer to continue as a non-verified user with limited access"
+      instructions_4_html: "If you want to verify your account later on, you can do so in <i>My account -> Verify my account</i>."
   omniauth:
     finish_signup:
       title: Add Email

config/locales/es.yml

@@ -213,6 +213,14 @@ es:
       all: "No tienes permiso para realizar la acción '%{action}' sobre %{subject}."
   welcome:
     last_debates: Últimos debates
+    welcome:
+      title: Verificación de cuenta
+      instructions_1_html: "Bienvenido a la página de participación ciudadana"
+      instructions_2_html: "Hemos detectado que <b>tu email está confirmada pero no hemos verificado tus datos todavía</b>."
+      instructions_3_html: "Sin verificar tus datos <b>el acceso que tienes es limitado</b>. Verificarlos ahora te permitirá, por ejemplo, apoyar propuestas ciudadanas."
+      verify_account: "Verificar mi cuenta"
+      go_to_index: "Quiero entrar como un usuario no verificado (acceso limitado)"
+      instructions_4_html: "Si quieres verificarte más tarde, puedes hacerlo en <i>Mi cuenta -> Verificar mi cuenta</i>."
   omniauth:
     finish_signup:
       title: Añade tu email

config/routes.rb

@@ -1,6 +1,7 @@
 Rails.application.routes.draw do
   devise_for :users, controllers: {
                        registrations: 'users/registrations',
+                       sessions: 'users/sessions',
                        omniauth_callbacks: 'users/omniauth_callbacks'
                      }
   devise_for :organizations, class_name: 'User',
@@ -25,6 +26,8 @@ Rails.application.routes.draw do
 
   # You can have the root of your site routed with "root"
   root 'welcome#index'
+  get '/welcome', to: 'welcome#welcome'
+
 
   resources :debates do
     member do