Fix #2221 (cellNav): Add scrollToFocus method
Merge pull request #2376 from PaulL1/2221_scrollToFocus

Fix #2221 (cellNav): Add scrollToFocus method
Issue #2149 - override expandableRowHeaderColDef.displayName
Issue #2382 - Disable resizing of expandable buttons column
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
Merge pull request #2383 from MattAtBT/2382

Issue #2382 - Disable resizing of expandable buttons column
fix for #2311 and other issues in grid editors