import from old project
replace browserify with gulp-browserify for speed
Merge branch 'master-upstream'

* master-upstream:
  replace browserify with gulp-browserify for speed

Conflicts:
	package.json