New contention filert.  CandidateCompareModule
Merge branch 'master' of https://github.com/herndon/FNALComp

Conflicts:
	Modules/test/trackReco.cc
	configfile.txt
	test/log_dataGen
	test/log_dataRead
	test/log_hitReco
	test/log_trackReco
New contention filert.  CandidateCompareModule, TrackCandidateStrategy2X1SASML
Merge branch 'master' into production