fixed js bubbling
Merge branch 'master' into fix-js-bubbling

Conflicts:
	dist/react.min.js