Updated readme.txt and version number
Merge remote-tracking branch 'origin/dev.2' into dev.2