Less memory management during tracking
Less memory management
Format source code
Changed id of quadcopter from 2 to 4
Merge branch 'master' into visual_tracking

Conflicts:
	src/main.cpp
	test/TestTracking.cpp