Update package.json
Update Gruntfile.js
Merge remote-tracking branch 'origin/elenarc'