Merge branch 'swith_article_view'
fix bookmark error
fix getActivity may be null problem
Merge branch 'master' into china_publish