feat(gulpfile.js): updated gulpfile with js tasks
feat(gulpfile.js): updated watch tasks
chore(js/custom): renamed main.js
Merge branch 'dev'