67 - merge tbl_demographics into patient table

Fixed the problem about after move Patient.java and BaseModel.java to
common area, can't pass the compiler.