Add a more complete README
Merge remote-tracking branch 'upstream/master' into develop

Conflicts:
	README.md