CRM-12183
CRM-12170 : fix for header shift and incorrect showing of contact type in listing
CRM-12185
Merge pull request #231 from pratik-joshi/CRM-12170

CRM-12170 : fix for header shift and incorrect showing of contact type i...
Merge pull request #230 from dlobo/CRM-12185

CRM-12185
Merge pull request #229 from dlobo/CRM-12183

CRM-12183