readme.md update
Merge branch 'master' into on-wp.org

Conflicts:
	readme.txt