Merge branch 'doctor_recurrency_disponibility'

Conflicts:
	app/models/appointment.rb
	app/models/time_slot.rb