update cpputest
Merge branch 'master' of https://github.com/terryyin/mahjong_cpp

Conflicts:
	cpputest
	cpputest/README.md
	cpputest/build/MakefileWorker.mk
	cpputest/include/CppUTest/Utest.h
	cpputest/include/CppUTestExt/GTestConvertor.h
	cpputest/scripts/ReleaseCppUTest.sh
	cpputest/scripts/convertToUnity/cpp_u_test_to_unity.rb
	cpputest/scripts/convertToUnity/cpp_u_test_to_unity_utils_tests.rb
	cpputest/scripts/convertToUnity/create_group_runner.rb
	cpputest/scripts/convertToUnity/create_unity_test_runner.rb
	cpputest/scripts/zipExclude.txt
	cpputest/src/CppUTest/SimpleString.cpp
	cpputest/src/CppUTestExt/GTestConvertor.cpp
	cpputest/tests/CppUTestExt/TestGTest.cpp
	cpputest/tests/JUnitOutputTest.cpp