Pull in current ng-grid master and fix #645