Merge pull request #63 from hariadi/master

Update Gruntfile.js after move templates
Merge remote-tracking branch 'upstream/master' into plugins