filter testing harness
Merge remote-tracking branch 'origin/Z2' into filter_harness
documentation for the filter testing harness
Merge remote-tracking branch 'origin/Z2' into filter_harness
Z3 merge
Merge branch 'release-1.0beta-refresh' into filter_harness
test implementation
Merge branch 'cmake_build' into query_classifier_test
Merge branch 'release-1.0beta-refresh' into filter_harness
Merge branch 'release-1.0beta-refresh' into query_classifier_test
test executable now works
Added tests to cmake
Merge branch 'develop' into query_classifier_test

Conflicts:
	README
	macros.cmake
Added extra tests; tidied.
Minor modifications for testing.
Change spinlock to use gcc atomic function when available; enhanced spinlock tests.
Minor changes to tests; fix typo; tidy up.
Changed the way query classifier test is run.
Now the test is a single executable, which should make it easier to use with CMake.
Split the filter testing harness into two different versions, the interactive and command line tool.
Merge remote-tracking branch 'origin/develop' into filter_harness