Remove conflicts.
Merge branch 'master' of github.com:leprakahn/PatientCare into servicehistory