MAC thinkpad
Merge branch 'master' of https://github.com/13911256582/SpeakHere-Speaker-Side

Conflicts:

SpeakHere.xcodeproj/project.xcworkspace/xcuserdata/shaoling.xcuserdatad/
UserInterfaceState.xcuserstate