Updated grid
Updated package json.
Merge branch 'develop' into gh-pages