fixed version number and changelog
Merge branch 'svn'