first step for manual merging of the slickgrid branch