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

app/assets/javascripts/application.js

@@ -39,6 +39,7 @@
 //= require annotatable
 //= require advanced_search
 //= require registration_form
+//= require show_results
 
 var initialize_modules = function() {
   App.Comments.initialize();
@@ -53,6 +54,7 @@ var initialize_modules = function() {
   App.Annotatable.initialize();
   App.AdvancedSearch.initialize();
   App.RegistrationForm.initialize();
+  App.ShowResults.initialize();
 };
 
 $(function(){