Fixed gulpfile for dist task
Merge branch 'master' into gh-pages
Fixed script order