bugfix
mark react as dev dependency
Merge branch 'master' into gh-pages