Scheduleコミット
Merge remote-tracking branch 'origin/master'

Conflicts:
	ITSP_Client/src/jp/ac/titech/itpro/sds/fragile/ScheduleActivity.java