Update README.md
Merge branch 'master' into updated-admin-ui

Conflicts:
	README.md