修改闹钟列表
Merge branch 'master' of https://github.com/lsyiverson/clock-app.git

Conflicts:
	res/values/strings.xml
	src/com/alarmclock/shake/app/widget/ShakeAlarmClockAdapter.java