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

Conflicts:
	app/controllers/users_controller.rb