merged changes in demo/* and Gruntfile.js