complete good
for beck
for up Merge branch 'master' of https://github.com/xueweiyema/InRelays

Conflicts:
	src/com/inrelays/activity/SetAlarmActivity.java
	src/com/inrelays/alarm/Alarm.java
	src/com/inrelays/alarm/Alarms.java