local commit?
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/timetableedit.xml
	src/jp/sample/time_table/TimeTableEditActivity.java