0.6
Merge branch 'master' of https://github.com/Oekakisoli/NekoIM

Conflicts:
	Client/Windows/langpack_chinese.txt
	Client/Windows/更新履历.txt