Add id field
Add patient address
Fix whitespace
fixed merge conflict
Merge branch 'patient-id'