Merge branch 'master' of https://github.com/chandlersong/TestCase

Conflicts:
	CPPTestCase/StdStudy/DefineTest.h
Merge branch 'master' of https://github.com/chandlersong/TestCase