update changelog
change version string
Merge pull request #1903 from minggo/master

update changelog and version string