Merge branch 'origin/liquidaciones-2'

Conflicts:
	app/controllers/liquidaciones_sumar_controller.rb
	app/models/liquidacion_sumar.rb