Cambios menores
Merge branch 'dev' of github.com:lealtag/api-cristo into dev

Conflicts:
	Gemfile.lock
Merge branch 'dev' of github.com:lealtag/api-cristo into dev

Conflicts:
	app/controllers/analytics_controller.rb
Merge branch 'dev' of github.com:lealtag/api-cristo into dev
Correccion en los endpoints asociados a recurrencias