Grunt: Use env instead of target. Fix files generator with grunt.
Merge pull request #1005 from pazguille/v1.0

Grunt: Use env instead of target. Fix files generator with grunt.