fix gulp deploy task
Merge branch 'dev' into gh-pages
files for deploy