docs update
Merge branch 'master' into sphinx-es-cubrid

Conflicts:
	README.md