a
Merge branch 'master' of github.com:774663576/Interestfriend

Conflicts:
	bin/R.txt
	bin/classes/android/support/v7/appcompat/R$layout.class
	bin/classes/com/fourmob/datetimepicker/R$id.class
	bin/classes/com/fourmob/datetimepicker/R$layout.class
	bin/classes/com/interestfriend/FeedBackActivity$ListScrollListener.class
	bin/classes/com/interestfriend/R$drawable.class
	bin/classes/com/interestfriend/R$id.class
	bin/classes/com/interestfriend/R$integer.class
	bin/classes/com/interestfriend/R$layout.class
	bin/classes/com/interestfriend/R$menu.class
	bin/classes/com/interestfriend/R$raw.class
	bin/classes/com/interestfriend/R$string.class
	bin/classes/com/interestfriend/R$style.class
	bin/classes/com/interestfriend/R$styleable.class
	bin/classes/com/interestfriend/activity/BaiduMapActivity.class
	bin/classes/com/interestfriend/activity/CategoryCircleActivity.class
	bin/classes/com/interestfriend/activity/ChatActivity$PressToSpeakListen.class
	bin/classes/com/interestfriend/activity/ChatActivity.class
	bin/classes/com/interestfriend/activity/ChatAllHistoryActivity.class
	bin/classes/com/interestfriend/activity/CircleInfoActivity.class
	bin/classes/com/interestfriend/activity/CircleMemberActivity.class
	bin/classes/com/interestfriend/activity/CircleMemberOfSelfInfoActivity.class
	bin/classes/com/interestfriend/activity/CommentActivity.class
	bin/classes/com/interestfriend/activity/CreateCircleActivity.class
	bin/classes/com/interestfriend/activity/FeedBackActivity$7.class
	bin/classes/com/interestfriend/activity/FeedBackActivity$PressToSpeakListen.class
	bin/classes/com/interestfriend/activity/FeedBackActivity.class
	bin/classes/com/interestfriend/activity/HomeActivity.class
	bin/classes/com/interestfriend/activity/ImageGridFragment$ImageAdapter.class
	bin/classes/com/interestfriend/activity/ImageGridFragment.class
	bin/classes/com/interestfriend/activity/LoginActivity.class
	bin/classes/com/interestfriend/activity/MainActivity.class
	bin/classes/com/interestfriend/activity/NearCirclesActivity.class
	bin/classes/com/interestfriend/activity/PublicshGrowthActivity$MyAdapter.class
	bin/classes/com/interestfriend/activity/PublicshGrowthActivity.class
	bin/classes/com/interestfriend/activity/PublishGrowthImagePagerActivity.class
	bin/classes/com/interestfriend/activity/PublishVideoActivity.class
	bin/classes/com/interestfriend/activity/RecorderVideoActivity.class
	bin/classes/com/interestfriend/activity/SearchCirclsActivity.class
	bin/classes/com/interestfriend/activity/SettingActivity.class
	bin/classes/com/interestfriend/activity/ShowBigImage.class
	bin/classes/com/interestfriend/activity/ShowNormalFileActivity.class
	bin/classes/com/interestfriend/activity/ShowVideoActivity.class
	bin/classes/com/interestfriend/activity/UpdateUserInfoActivity.class
	bin/classes/com/interestfriend/activity/VideoCommentActivity.class
	bin/classes/com/interestfriend/activity/VoiceCallActivity.class
	bin/classes/com/interestfriend/activity/WelcomActivity.class
	bin/classes/com/interestfriend/activity/imagefactory/ImageFactoryActivity.class
	bin/classes/com/interestfriend/activity/imagefactory/ImageFactoryCrop.class
	bin/classes/com/interestfriend/adapter/CategoryCircleAdapter.class
	bin/classes/com/interestfriend/adapter/ChatAdapter.class
	bin/classes/com/interestfriend/adapter/ChatAllHistoryAdapter.class
	bin/classes/com/interestfriend/adapter/ChatGridViewAdapter.class
	bin/classes/com/interestfriend/adapter/CircleMemberAdapter.class
	bin/classes/com/interestfriend/adapter/CommentAdapter.class
	bin/classes/com/interestfriend/adapter/ExpressionAdapter.class
	bin/classes/com/interestfriend/adapter/GroupChatAdapter.class
	bin/classes/com/interestfriend/adapter/GrowthAdapter.class
	bin/classes/com/interestfriend/adapter/GrowthImgAdapter.class
	bin/classes/com/interestfriend/adapter/GrowthListCommentAdapter.class
	bin/classes/com/interestfriend/adapter/GrowthVideoAdapter$Onclick.class
	bin/classes/com/interestfriend/adapter/GrowthVideoAdapter.class
	bin/classes/com/interestfriend/adapter/MemberCirclesAdapter.class
	bin/classes/com/interestfriend/adapter/MyCircleAdapter.class
	bin/classes/com/interestfriend/adapter/NearCirclesAdapter.class
	bin/classes/com/interestfriend/adapter/VideoCommentAdapter.class
	bin/classes/com/interestfriend/adapter/VideoListCommentAdapter.class
	bin/classes/com/interestfriend/chooseimage/PhotoAdapter.class
	bin/classes/com/interestfriend/chooseimage/PhotoFolderAdapter.class
	bin/classes/com/interestfriend/chooseimage/PhotoFolderFragment.class
	bin/classes/com/interestfriend/chooseimage/PhotoFragment.class
	bin/classes/com/interestfriend/chooseimage/SelectPhotoActivity.class
	bin/classes/com/interestfriend/findpassword/FindPasswordActivity.class
	bin/classes/com/interestfriend/findpassword/FindPasswordCheckVerifyCode.class
	bin/classes/com/interestfriend/findpassword/FindPasswordGetVerifyCode.class
	bin/classes/com/interestfriend/findpassword/FindPasswordSetPassword.class
	bin/classes/com/interestfriend/fragment/CircleGroupChatFragment$PressToSpeakListen.class
	bin/classes/com/interestfriend/fragment/CircleGroupChatFragment.class
	bin/classes/com/interestfriend/fragment/CircleGrowthFragment.class
	bin/classes/com/interestfriend/fragment/CircleMemberFragment.class
	bin/classes/com/interestfriend/fragment/FindCircleFragmen.class
	bin/classes/com/interestfriend/fragment/ImageFragment.class
	bin/classes/com/interestfriend/fragment/MyCircleFragment.class
	bin/classes/com/interestfriend/fragment/VideoFragment.class
	bin/classes/com/interestfriend/popwindow/CircleMemberFragmentRightPopwindow.class
	bin/classes/com/interestfriend/popwindow/CommentPopwindow.class
	bin/classes/com/interestfriend/popwindow/SelectCircleCategoryPopWindow$MyAdapter.class
	bin/classes/com/interestfriend/popwindow/SelectCircleCategoryPopWindow.class
	bin/classes/com/interestfriend/popwindow/SelectPicPopwindow.class
	bin/classes/com/interestfriend/register/RegisterActivity.class
	bin/classes/com/interestfriend/register/RegisterBasicInfo.class
	bin/classes/com/interestfriend/register/RegisterPhone.class
	bin/classes/com/interestfriend/register/RegisterSetPassword.class
	bin/classes/com/interestfriend/register/RegisterUserName.class
	bin/classes/com/interestfriend/showbigpic/ImageDetailFragment.class
	bin/classes/com/interestfriend/showbigpic/ImagePagerActivity.class
	bin/classes/com/interestfriend/task/LoadLocalBigImgTask.class
	bin/classes/com/interestfriend/utils/DialogUtil.class
	bin/classes/com/interestfriend/utils/HttpUrlHelper.class
	bin/classes/com/interestfriend/view/DrawerLeftMenu.class
	bin/classes/com/interestfriend/view/HighlightView.class
	bin/classes/com/interestfriend/view/PullDownView.class
	bin/classes/com/interestfriend/view/ScrollOverListView.class
	gen/android/support/v7/appcompat/R.java
	gen/com/fourmob/datetimepicker/R.java
	gen/com/interestfriend/R.java
join circle