Issue #2149 - override expandableRowHeaderColDef.displayName
Merge pull request #2381 from MattAtBT/2149

Issue #2149 - override expandableRowHeaderColDef.displayName
Merge branch 'master' of https://github.com/angular-ui/ng-grid into 2382

Conflicts:
	src/features/expandable/js/expandable.js