calibration_collect all sample
before merge
Merge remote-tracking branch 'origin/origin' into origin

Conflicts:
	Trombone/.classpath
	Trombone/res/layout/activity_main_ui.xml