Merge branch 'suggest_before_creating'

Conflicts:
	app/assets/javascripts/application.js
	app/controllers/debates_controller.rb
	app/controllers/proposals_controller.rb
	config/locales/es.yml
	config/routes.rb
	db/schema.rb
	spec/features/debates_spec.rb
	spec/features/proposals_spec.rb

config/routes.rb

@@ -38,9 +38,9 @@ Rails.application.routes.draw do
       put :flag
       put :unflag
     end
-
     collection do
       get :map
+      get :suggest
     end
   end
 
@@ -51,9 +51,9 @@ Rails.application.routes.draw do
       put :flag
       put :unflag
     end
-
     collection do
       get :map
+      get :suggest
     end
   end
 
@@ -242,4 +242,4 @@ Rails.application.routes.draw do
   # static pages
   get '/blog' => redirect("http://diario.madrid.es/participa/")
   resources :pages, path: '/', only: [:show]
-end
+end