update readme
Merge branch 'master' into gemstone2.4

Conflicts:
	README.md