syncronizing with dquartul branch

Conflicts:
	trackers/longitudinal_tracker.py