* 修正换行
Merge branch 'master' of https://github.com/zpublic/zpublic into sum_base
Merge pull request #118 from siren186/master

* 将与平台相关的代码实现部分,移到.hpp文件中.
* 更新readme
Merge branch 'master' of https://github.com/zpublic/zpublic
* 加入ZLComInitSecurity模块
Merge pull request #119 from zpublic/sum_base

Sum base
Merge branch 'master' of https://github.com/zpublic/zpublic

Conflicts:
	src/test_pellets/test_pellets.vcxproj.filters