modify calibration
Merge branch 'origin' of https://github.com/kch31411/Trombone.git into
origin

Conflicts:
	Trombone/bin/Trombone.apk
	Trombone/bin/classes.dex