Merge branch 'development'
update readme.txt for release
update main file (version)
Merge branch 'master' into development