Update README.md
Update README.md
Merge branch 'jellybean' into jellybean-legacy

Conflicts:
	README.md