pull from remote
Merge branch 'master' of https://github.com/xueweiyema/InRelays

Conflicts:
	gen/com/inrelays/R.java
	res/layout/mfactorylayout.xml
	src/com/inrelays/activity/SetAlarmActivity.java
	src/com/inrelays/alarm/Alarm.java
	src/com/inrelays/alarm/Alarms.java
	src/com/inrelays/units/InRelaysPreference.java