merge
Merge remote-tracking branch 'origin/origin' into origin

Conflicts:
	Trombone/.classpath
	Trombone/AndroidManifest.xml
	Trombone/gen/com/example/trombone/R.java
	Trombone/res/layout/activity_calibration.xml
	Trombone/res/layout/activity_display.xml
	Trombone/res/layout/activity_main_ui.xml
	Trombone/src/classes/Memo.java
	Trombone/src/com/example/trombone/CalibrationActivity.java
	Trombone/src/com/example/trombone/DisplayActivity.java
	Trombone/src/com/example/trombone/HistoryActivity.java
	Trombone/src/com/example/trombone/MainUIActivity.java
	Trombone/src/db/DBMemoHelper.java
	Trombone/src/db/DBSheetHelper.java
partially merged