gruntfile and package.json updated
Merge branch 'develop' of github.com:opencb/cellbrowser into develop