* 调整代码逻辑
* 漏提文件
* 调整代码风格
Merge pull request #121 from siren186/master

* 工程文件漏提
字符编码转换

1, 使用string.resize()减少new的调用
2，增加了utf8与gbk之间的转换
3，static修改为inline
Merge pull request #122 from ichenq/dobby_master

字符编码转换
* 加入wmi查询封装类
Merge branch 'master' of https://github.com/zpublic/zpublic into sum_base

Conflicts:
	src/test_pellets/test_pellets.vcxproj.filters
* 修正同步问题
Merge pull request #1 from zpublic/master

merge
* z_platform/sleep
* z_platform目录结构调整
* z_platform/thread and unittest
Merge branch 'master' of https://github.com/zpublic/zpublic into sum_base

Conflicts:
	src/test_pellets/test_pellets.cpp
	src/test_pellets/test_pellets.vcxproj.filters
* 补漏文件
* 调整逻辑
* 修正误提交
Merge pull request #123 from zpublic/sum_base

Sum base
更多的lambda测试
由于编码问题实在没法解决，写了英文注释
Merge pull request #124 from wohaaitinciu/master

更多的lambda测试