Fixed conflict.
--HR-339 Pre-populate "email" activity with case contact(s)
Vacancy Webtest and CRM test fixes
Merge pull request #555 from monishdeb/HR-340

Vacancy Webtest and CRM test fixes
Merge pull request #548 from NileemaJadhav/HR-339

--HR-339 Pre-populate "email" activity with case contact(s)
Merge branch 'master' of git://github.com/civicrm/civihr into HR-316-work
HR-316 Code comment and cleanup