Updated readme and changelog
Updated changelog
Merge branch 'master' into ios_redacted

Conflicts:
	README.md