add alarmservice
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/airAd/yaqinghui/ui/PushClose.java
add alarm related service
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/values/strings.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
complete alarm config