swap uglify with minify, better minification size
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Makefile
	package.json
Merge pull request #780 from silverbucket/master

quick add