Merge branch 'chende'
登录成功，向setting中添加用户名
Merge remote-tracking branch 'origin/master' into chende
去掉引导页面的同步设置开关
关联设备显示样式
Merge remote-tracking branch 'origin/master' into chenyan

Conflicts:
	src/com/chainton/pdmclient/LoginActivity.java