Store calibration data as DB
Merge branch 'origin' of https://github.com/kch31411/Trombone into origin

Conflicts:
	Trombone/src/com/example/trombone/CalibrationActivity.java