闹钟列表和数据库
Merge branch 'master' of https://github.com/lsyiverson/clock-app.git

Conflicts:
	AndroidManifest.xml
	src/com/alarmclock/shake/app/utils/Utils.java