Merge branch 'master' of https://github.com/zpublic/zpublic into sum_base
* 修正一下register单元测试在亮哥机器上跑不过的问题
+ 加入控制台颜色处理相关
Merge pull request #55 from zpublic/sum_base

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

Conflicts:
	pellets/z_win_utils/win_utils.h
	src/test_pellets/TestWinUtils.h