add dialogSwitchQRCode
Merge branch 'develop' of https://github.com/bither/bither-ios into develop

Conflicts:
	bither-ios.xcodeproj/project.pbxproj
Merge branch 'develop' of https://github.com/bither/bither-ios into develop
upgrade
Merge branch 'develop' of https://github.com/bither/bither-ios into develop