grunt built made a dist folder
Merge branch 'master' into gh-pages