feat(gulpfile): added concat for js
Merge branch 'dev'