增加判定時間到+10
Merge remote-tracking branch 'origin/master'

Conflicts:
	MusicSalvationSDKVerson/gen/com/example/musicsalvationsdkverson/R.java