MedicalRecord and FeeTranscation entites included
Merge origin/master