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

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