分组功能完成
解决冲突
Revert "解决冲突"

This reverts commit e0294d5d7904103197f6e37495e458e05254105f.
收藏、我的转发、表情包、@好友
Merge remote-tracking branch 'origin/dev-2.0' into dev-2.0

Conflicts:
	MWorld/res/layout/drawer_contents.xml
	MWorld/src/com/mworld/ui/fragment/FriendsFragment.java
	MWorld/src/com/mworld/ui/fragment/LeftMenuFragment.java
	MWorld/src/com/mworld/ui/fragment/RepostFragment.java
	MWorld/src/com/mworld/ui/main/MainActivity.java
	MWorld/src/com/mworld/ui/main/WriteActivity.java