Update README.md
Merge branch 'develop' into test

Conflicts:
	README.md