Merge branch 'develop' of https://github.com/csabyte/ApprovalTests.Cpp into develop

Conflicts:
	tests/run_all_tests.cpp
Merge branch 'develop' of https://github.com/csabyte/ApprovalTests.Cpp into develop