nothing
Merge branch 'master'

Conflicts:

ShaiWaWa.xcworkspace/xcuserdata/Carl_Huang.xcuserdatad/UserInterfaceStat
e.xcuserstate
Merge branch 'master' into working-2
do all kinds of button Touch Event conn to pos method
更新设置，获取消息，添加宝宝，宝宝列表等
noting
注册流程，消息页面处理。。。
noting
测试接口
录音等等优化