Added setForEach method on grid
Fixed mergeconflict