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