修改了lamp，自定义图标，增加了power布局
修改tabcam，删除一条语句
Merge remote-tracking branch 'github/master'

Conflicts:
	bin/classes/com/seuic/devetc/RF_Lamp.class
	bin/classes/com/seuic/devetc/RF_Switch.class
	bin/classes/com/seuic/devetc/RF_WH.class
	bin/classes/com/seuic/net/SetupAp.class
	bin/classes/com/seuic/smartgateway/LogoActivity.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/TabCam.class
	bin/classes/com/seuic/smartgateway/TabControl.class
	bin/classes/com/seuic/smartgateway/TabIR.class
	bin/classes/com/seuic/smartgateway/TabRF$2.class
	bin/classes/com/seuic/smartgateway/TabRF$3$1.class
	bin/classes/com/seuic/smartgateway/TabRF$3$2.class
	bin/classes/com/seuic/smartgateway/TabRF$3.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