fixes Grunt file for new structure
Merge branch 'develop' and pushed version 0.2.1.3