Upgraded grunt-browserify
Merge branch 'master' into upgrade-grunt-browserify

Conflicts:
	package.json
Merge pull request #41 from Hacker0x01/upgrade-grunt-browserify

Upgraded grunt-browserify