update README.md and UPGRADE.md

Conflicts:
	UPGRADE.md