Fixed conflict.
--HR-339 Pre-populate "email" activity with case contact(s)
Merge pull request #548 from NileemaJadhav/HR-339

--HR-339 Pre-populate "email" activity with case contact(s)