Added react-tools
Merge branch 'master' into upgrade-grunt-browserify

Conflicts:
	package.json