67 - merge tbl_demographics into patient table

Moved the Patient.java and BaseModel.java to common area.