合入配置部分代码。
Merge branch 'master' of https://github.com/sailzeng/zcelib

Conflicts:
	src/test/zeolot/zealot.vc120.vcxproj.filters
	src/test/zeolot/zealot_main.cpp
	src/test/zeolot/zealot_test_config.cpp