merge react.js into master