Merge pull request #384 from CruGlobal/MH-1034

Mh 1034
Set column header of the survey questions in all contacts page table list
Fix conflicts after merging MH-1028 to dev