Readme update
Merge branch 'master' into react_table

Conflicts:
	README.md
Merge branch 'react_table'