修改了TOOL
Merge remote-tracking branch 'lipeng/master' into temp
  第三方登录基本完成，服务器差token字段
Merge remote-tracking branch 'liuyangjie/master' into liuyangjie
合并绑定
通过修改友盟授权页的弹出方式，修复了NavigationBar覆盖statusBar的BUG
nothing
mergeconflicts
Merge branch 'branchtmp'
添加了清内存
nothing
nothing
Merge branch 'branch'
修改了0528bug
test
Merge remote-tracking branch 'lipeng/remote/master'
testmerge
adf
testasdfasdfasdf
asdfjkaskjfdkjaskjdf