merged grid changes with the latest from the original slick grid