Fixed conflict.
--HR-339 Pre-populate "email" activity with case contact(s)
HR fix to show case status for application case activity
Merge pull request #553 from NileemaJadhav/HR-13-fix

HR fix to show case status for application case activity
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)
HR-316 Extend "Evaluation" activity type
HR-316 Code comment and cleanup
Merge pull request #556 from NileemaJadhav/HR-316-work

HR-316 Extend "Evaluation" activity type
HR-341 Update cj references
HR-341 Modification to add closure and newline
Tweaks