t#   (use "git reset HEAD <file>..." to unstage)
Merge branch 'design'

Conflicts:
	MicroSpeaker/.DS_Store
	MicroSpeaker/MicroSpeaker.xcworkspace/xcuserdata/wy.xcuserdatad/UserInterfaceState.xcuserstate
	MicroSpeaker/MicroSpeaker.xcworkspace/xcuserdata/wy.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	MicroSpeaker/MicroSpeaker/.DS_Store
Merge branch 'design'
Merge branch 'design'

Conflicts:
	MicroSpeaker/MicroSpeaker.xcworkspace/xcuserdata/wy.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'design'

Conflicts:
	MicroSpeaker/MicroSpeaker.xcworkspace/xcuserdata/wy.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'design'
Update UserConfig.m

Remove some unused code.
Update UserConfig.m

修改UserConfig类的数据的本地化存储。
Update UserConfig.m

修复语法错误。
修复一些bug。
实现了授权、注册、登录的功能。
实现搜索和查看消息详情需要登录。