grunt dist
Merge branch 'hotfix/gruntdist'