add tracepoints
Merge branch 'master' of github.com:CVVisualPSETeam/CVVisual

Conflicts:
	manual_test/match/main.cpp
fix compiler-error. please test before pushing (and commiting)
fix clang-warning resulting from use of unsuitable integer-types