合并苏滨代码，修改密码显示错误

合并苏滨代码，修改密码显示错误
Merge branch 'master' of https://github.com/Fanty/bsl-client

Conflicts:
	platforms/ios/bsl.xcodeproj/project.pbxproj
	platforms/ios/bsl.xcworkspace/xcshareddata/bsl.xccheckout