Fixed multi quadcopter tracking
Merge commit '4beee6'

Conflicts:
	src/Tracker.cpp
Merge branch 'master' into visual_tracking

Conflicts:
	test/TestTracking.cpp