update CHANGES
bump
version check
Merge remote-tracking branch 'upstream/master'

Conflicts:
	shadowsocks-csharp/View/ConfigForm.cs
	shadowsocks-csharp/shadowsocks-csharp.csproj