Merge branch 'master' into development
[UPDATE] cleaned up package.json, Gruntfile.js and node module dependencies
Merge branch 'development'
[UPDATE] version bump