Update README.md
Merge branch 'master' into develop

* master:
  Update README.md

Conflicts:
	README.md