Merge pull request #149 from reactjs/features/managing-state

Merge pull request #149 from reactjs/features/managing-state #279