Revert "Merge branch 'master' of https://github.com/facebook/react into on-demand-events"

This reverts commit 3bec9536de57f4bb9fe1b862b3dd806a8ea07fbf.
Merge branch 'master' of https://github.com/facebook/react into HEAD

Conflicts:
	src/event/EventPluginRegistry.js