fixed package.json for grunt-nodemon
Merge branch 'dev'