modify
manual merge with master
Merge branch 'test3'

Conflicts:
	multiTrackAssociation.cpp
	multiTrackAssociation.h
	tracker.cpp