Merge branch 'anyTime+char_branch'

Conflicts:

Time-Line.xcworkspace/xcuserdata/IF.xcuserdatad/UserInterfaceState.xcuse
rstate
Merge branch 'anyTime+char_branch'

Conflicts:

Time-Line.xcworkspace/xcuserdata/IF.xcuserdatad/UserInterfaceState.xcuse
rstate
Merge branch 'anyTime_modifyBug'修改登陆动画等

Conflicts:

Time-Line.xcworkspace/xcuserdata/IF.xcuserdatad/UserInterfaceState.xcuse
rstate
修改登陆界面
Merge branch 'master' into anyTime_modifyBug
Merge branch 'anyTime_modifyBug'
修改登陆动画
Merge branch 'master' into anyTime_modifyBug
修改设置的中的中文