Update README.md
All updates from master now in develop

Merge branch 'master' into develop

Conflicts:
	README.md