完成了长按房台弹出tab由fragemnt+viewpager改为tabhost+fragment的改变;点击tab内按钮打开activity时，getIntent出现空指针
Merge branch 'zlp' into dev