Merge pull request #641 from PoonamNalawade/HR_359

--HR-359 Typo fixes
fixes to remove application from dashboard and change order of fields in new individual
fixes
Merge pull request #642 from divya-jose/emergencyfield_changes

fixes to remove application from dashboard and change order of fields in...
--HR_359 Fixes to display sick type in mail