sync

sync
Merge branch 'master' of https://github.com/leonfu/temp

Conflicts:

NextIdentity.xcodeproj/project.xcworkspace/xcuserdata/Leon.xcuserdatad/U
serInterfaceState.xcuserstate