Added patient intake feature
Resolve conflict
Merge branch 'ronygomes-feature/patient-intake' into develop