updated patient info. moved age and gender. removed smoking and drinking history
Merge branch 'master' into working
edited some stuff and added doctors view notes <3
added view canvas in doctors notes. and added enhancements in doctors notes (text)
Added

save patient_id to preferences once patient is selected
Merge with my working editable

Conflicts:
	Preferences.java
updated doctors view for canvas
updated and enhanced laboratory activities :)
Update

Fix Patient Info Expandable List Medical History
unfinished getNotesFromTag
Merge branch 'master' into working

Conflicts:
	MainActivity/src/com/example/model/Preferences.java
preferences conflict merge
date created and modifed from notes conflict
for testing

Initial Sync: getNotesAPI, TagPatient: getNotesFromTag;
added Calculations for BMI and edited lab request
unfinished modules
Merge branch 'master' of https://github.com/yopilip123/DoctorsDashboard
Merge branch 'master' of https://github.com/alvinjay/DoctorsDashboard
Merge branch 'master' into working
CalculationsActivity

compute BMI, show rating