Merge branch 'segunda_fase' into servidor_de_pruebas

Conflicts:
	app/controllers/application_controller.rb
Merge branch 'segunda_fase' into servidor_de_pruebas