fixed js lint errors, cleaned merge

gulp build dist