Making the dist in example a copy of the main dist via grunt
Merge branch 'master' into gh-pages