增加了自定义界面，增加了lamp界面
Merge remote-tracking branch 'github/master'

Conflicts:
	bin/classes/com/seuic/devetc/RF_Lamp.class
	bin/classes/com/seuic/smartgateway/R$id.class
	bin/classes/com/seuic/smartgateway/R$layout.class
	bin/classes/com/seuic/smartgateway/R$string.class
	bin/classes/com/seuic/smartgateway/R$style.class
	bin/classes/com/seuic/smartgateway/TabControl.class
	bin/classes/com/seuic/smartgateway/TabIR.class
	bin/classes/com/seuic/smartgateway/TabRF.class
	bin/classes/com/seuic/smartgateway/TabSET.class
	bin/classes/com/seuic/smartgateway/TabTH.class
	gen/com/seuic/smartgateway/R.java