Merge branch 'branch'
test
Merge remote-tracking branch 'lipeng/remote/master'
adf
合并lizhengfeng
修改ios按钮
1、修改iOS6系统下所有button的类型
2、反馈意见不成功（改为友盟意见反馈）

1、修改iOS6系统下所有button的类型
2、反馈意见不成功（改为友盟意见反馈）
3、找回密码界面需要修改
4、注册界面调整
Merge remote-tracking branch 'lipeng/remote/master'
Merge branch 'branch'

Conflicts:

ScreenShow/ScreenShow.xcodeproj/project.xcworkspace/xcuserdata/lee.xcuse
rdatad/UserInterfaceState.xcuserstate
	ScreenShow/我/mysub/充值/RchargeViewController.m
修改了下拉刷新的bug
Merge branch 'master' of https://github.com/jacklibonnie/ios-demo into master2
状态栏修改bug
nothing
nothing
nothing