进行了代码优化、调整
Merge remote-tracking branch 'origin/master'

Conflicts:
	projects/HDview/src/com/starnet/snview/alarmmanager/AlarmActivity.java
	projects/HDview/src/com/starnet/snview/alarmmanager/AlarmReceiver.java