added other-files to gulp
gulp working
Merge branch 'deploy-testing' into dev