Move base Grid and GridRender snippets to the Toolkit folder
Merge remote-tracking branch 'origin/master'