Added description field.
Merge remote-tracking branch 'origin'
Fixed collision, and added editable description field for doctors.