Merge branch 'master' into dev
Updating readme.txt with the modifcations done in WordPress SVN.
Merge branch 'dev'