0.1.6
Signed-off-by: Teeker Bin <bin@xun.lu>
Merge branch 'master' of https://github.com/nnjme/reindeer_android
2013.12.2

Signed-off-by: Teeker Bin <bin@xun.lu>
0.1.15
0.1.15
Merge branch 'master' of https://github.com/nnjme/reindeer_android

Conflicts:
	bin/AndroidManifest.xml
	bin/CLX.apk
	bin/classes.dex
	bin/classes/com/changlianxi/activity/AddCircleMemberActivity.class
	bin/classes/com/changlianxi/activity/AddOneMemberActivity$1.class
	bin/classes/com/changlianxi/activity/AddOneMemberActivity.class
	bin/classes/com/changlianxi/activity/CLXApplication.class
	bin/classes/com/changlianxi/activity/ChatActivity$1.class
	bin/classes/com/changlianxi/activity/ChatActivity$2.class
	bin/classes/com/changlianxi/activity/ChatActivity$3.class
	bin/classes/com/changlianxi/activity/ChatActivity$4.class
	bin/classes/com/changlianxi/activity/ChatActivity$GuidePageChangeListener.class
	bin/classes/com/changlianxi/activity/ChatActivity.class
	bin/classes/com/changlianxi/activity/CircleActivity.class
	bin/classes/com/changlianxi/activity/CircleInfoActivity.class
	bin/classes/com/changlianxi/activity/CircleSettingActivity$1.class
	bin/classes/com/changlianxi/activity/CircleSettingActivity$2.class
	bin/classes/com/changlianxi/activity/CircleSettingActivity$EditCirTask.class
	bin/classes/com/changlianxi/activity/CircleSettingActivity.class
	bin/classes/com/changlianxi/activity/CircleUserActivity$1.class
	bin/classes/com/changlianxi/activity/CircleUserActivity$EditWather.class
	bin/classes/com/changlianxi/activity/CircleUserActivity.class
	bin/classes/com/changlianxi/activity/CreateCircleActivity$1.class
	bin/classes/com/changlianxi/activity/CreateCircleActivity$2.class
	bin/classes/com/changlianxi/activity/CreateCircleActivity$CreateCirTask.class
	bin/classes/com/changlianxi/activity/CreateCircleActivity.class
	bin/classes/com/changlianxi/activity/EditCircleActivity$1.class
	bin/classes/com/changlianxi/activity/EditCircleActivity.class
	bin/classes/com/changlianxi/activity/FindPasswordActivity$1.class
	bin/classes/com/changlianxi/activity/FindPasswordActivity.class
	bin/classes/com/changlianxi/activity/GrowthActivity$1.class
	bin/classes/com/changlianxi/activity/GrowthActivity.class
	bin/classes/com/changlianxi/activity/LoginActivity$1.class
	bin/classes/com/changlianxi/activity/LoginActivity.class
	bin/classes/com/changlianxi/activity/MainActivity$1.class
	bin/classes/com/changlianxi/activity/MainActivity.class
	bin/classes/com/changlianxi/activity/MessageActivity$1.class
	bin/classes/com/changlianxi/activity/MessageActivity$2.class
	bin/classes/com/changlianxi/activity/MessageActivity$3.class
	bin/classes/com/changlianxi/activity/MessageActivity$GuidePageChangeListener.class
	bin/classes/com/changlianxi/activity/MessageActivity.class
	bin/classes/com/changlianxi/activity/NewsActivity.class
	bin/classes/com/changlianxi/activity/R$anim.class
	bin/classes/com/changlianxi/activity/R$array.class
	bin/classes/com/changlianxi/activity/R$attr.class
	bin/classes/com/changlianxi/activity/R$color.class
	bin/classes/com/changlianxi/activity/R$dimen.class
	bin/classes/com/changlianxi/activity/R$drawable.class
	bin/classes/com/changlianxi/activity/R$id.class
	bin/classes/com/changlianxi/activity/R$layout.class
	bin/classes/com/changlianxi/activity/R$menu.class
	bin/classes/com/changlianxi/activity/R$raw.class
	bin/classes/com/changlianxi/activity/R$string.class
	bin/classes/com/changlianxi/activity/R$style.class
	bin/classes/com/changlianxi/activity/R$styleable.class
	bin/classes/com/changlianxi/activity/R.class
	bin/classes/com/changlianxi/activity/RegisterActivity$2.class
	bin/classes/com/changlianxi/activity/RegisterActivity$RegisterTask.class
	bin/classes/com/changlianxi/activity/RegisterActivity.class
	bin/classes/com/changlianxi/activity/RegisterFinishActivity.class
	bin/classes/com/changlianxi/activity/ReleaseGrowthActivity$DelTask.class
	bin/classes/com/changlianxi/activity/ReleaseGrowthActivity$MyAdapter.class
	bin/classes/com/changlianxi/activity/ReleaseGrowthActivity$PicModle.class
	bin/classes/com/changlianxi/activity/ReleaseGrowthActivity$UpDataTask.class
	bin/classes/com/changlianxi/activity/ReleaseGrowthActivity$ViewHolder.class
	bin/classes/com/changlianxi/activity/ReleaseGrowthActivity.class
	bin/classes/com/changlianxi/activity/SelectContactsActivity$1.class
	bin/classes/com/changlianxi/activity/SelectContactsActivity$ContactsAdapter.class
	bin/classes/com/changlianxi/activity/SelectContactsActivity$ViewHolder.class
	bin/classes/com/changlianxi/activity/SelectContactsActivity.class
	bin/classes/com/changlianxi/activity/SmsInviteActivity.class
	bin/classes/com/changlianxi/activity/SmsPreviewActivity.class
	bin/classes/com/changlianxi/activity/UserInfoActivity$1.class
	bin/classes/com/changlianxi/activity/UserInfoActivity$2.class
	bin/classes/com/changlianxi/activity/UserInfoActivity.class
	bin/classes/com/changlianxi/adapter/CircleAdapter$ViewHolder.class
	bin/classes/com/changlianxi/adapter/CircleAdapter.class
	bin/classes/com/changlianxi/adapter/GrowthAdapter$1.class
	bin/classes/com/changlianxi/adapter/GrowthAdapter$2.class
	bin/classes/com/changlianxi/adapter/GrowthAdapter$BtnClick$1.class
	bin/classes/com/changlianxi/adapter/GrowthAdapter$BtnClick.class
	bin/classes/com/changlianxi/adapter/GrowthAdapter$ViewHolder.class
	bin/classes/com/changlianxi/adapter/GrowthAdapter.class
	bin/classes/com/changlianxi/adapter/GrowthImgAdapter$ViewHolder.class
	bin/classes/com/changlianxi/adapter/GrowthImgAdapter.class
	bin/classes/com/changlianxi/adapter/MessageAdapter$ViewHolder.class
	bin/classes/com/changlianxi/adapter/MessageAdapter.class
	bin/classes/com/changlianxi/adapter/MessageListAdapter$ViewHolder.class
	bin/classes/com/changlianxi/adapter/MessageListAdapter.class
	bin/classes/com/changlianxi/adapter/MyAdapter$ViewHolder.class
	bin/classes/com/changlianxi/adapter/MyAdapter.class
	bin/classes/com/changlianxi/adapter/NewsListAdapter.class
	bin/classes/com/changlianxi/adapter/SmsAdaprter$OnClick.class
	bin/classes/com/changlianxi/adapter/SmsAdaprter$PopClick.class
	bin/classes/com/changlianxi/adapter/SmsAdaprter.class
	bin/classes/com/changlianxi/db/DBUtils.class
	bin/classes/com/changlianxi/db/DataBase.class
	bin/classes/com/changlianxi/modle/CircleIdetailModle.class
	bin/classes/com/changlianxi/modle/CircleModle.class
	bin/classes/com/changlianxi/modle/ContactModle.class
	bin/classes/com/changlianxi/modle/GrowthImgModle.class
	bin/classes/com/changlianxi/modle/GrowthModle.class
	bin/classes/com/changlianxi/modle/Info.class
	bin/classes/com/changlianxi/modle/MemberModle.class
	bin/classes/com/changlianxi/modle/MessageModle.class
	bin/classes/com/changlianxi/modle/NewsModle.class
	bin/classes/com/changlianxi/popwindow/GrowthCommentsPopwindow$DelCommentsTask.class
	bin/classes/com/changlianxi/popwindow/GrowthCommentsPopwindow$GetCommentsTask.class
	bin/classes/com/changlianxi/popwindow/GrowthCommentsPopwindow$MyAdapter.class
	bin/classes/com/changlianxi/popwindow/GrowthCommentsPopwindow$PublishCommentsTask.class
	bin/classes/com/changlianxi/popwindow/GrowthCommentsPopwindow$ViewHolder.class
	bin/classes/com/changlianxi/popwindow/GrowthCommentsPopwindow.class
	bin/classes/com/changlianxi/popwindow/ListViewPopwindow$MyAdapter.class
	bin/classes/com/changlianxi/popwindow/ListViewPopwindow$ViewHolder.class
	bin/classes/com/changlianxi/popwindow/ListViewPopwindow.class
	bin/classes/com/changlianxi/popwindow/SelectPicPopwindow.class
	bin/classes/com/changlianxi/popwindow/ShowBigImgPopwindow$GetImage.class
	bin/classes/com/changlianxi/popwindow/ShowBigImgPopwindow$PageListener.class
	bin/classes/com/changlianxi/popwindow/ShowBigImgPopwindow$probarpop.class
	bin/classes/com/changlianxi/popwindow/ShowBigImgPopwindow.class
	bin/classes/com/changlianxi/popwindow/SmsSetNickNamePopWindow.class
	bin/classes/com/changlianxi/popwindow/UserSortPopwindow$MyAdapter.class
	bin/classes/com/changlianxi/popwindow/UserSortPopwindow$ViewHolder.class
	bin/classes/com/changlianxi/popwindow/UserSortPopwindow.class
	bin/classes/com/changlianxi/task/GetChatListTask.class
	bin/classes/com/changlianxi/task/GetCircleIdetailTask.class
	bin/classes/com/changlianxi/task/GetCircleListTask.class
	bin/classes/com/changlianxi/task/GetCircleUserTask.class
	bin/classes/com/changlianxi/task/GetGrowthListTask.class
	bin/classes/com/changlianxi/task/GetMessagesTask.class
	bin/classes/com/changlianxi/task/GetNewsListTask.class
	bin/classes/com/changlianxi/task/IinviteUserTask$IinviteUser.class
	bin/classes/com/changlianxi/task/IinviteUserTask.class
	bin/classes/com/changlianxi/task/SendMessageThread.class
	bin/classes/com/changlianxi/task/SetClientInfo.class
	bin/classes/com/changlianxi/task/UpLoadGrowthPicTask.class
	bin/classes/com/changlianxi/task/UpLoadPicAsyncTask.class
	bin/classes/com/changlianxi/util/AsyncImageLoader$2.class
	bin/classes/com/changlianxi/util/AsyncImageLoader.class
	bin/classes/com/changlianxi/util/BitmapUtils.class
	bin/classes/com/changlianxi/util/Constants.class
	bin/classes/com/changlianxi/util/DateUtils.class
	bin/classes/com/changlianxi/util/ErrorCodeUtil.class
	bin/classes/com/changlianxi/util/ExpressionUtil.class
	bin/classes/com/changlianxi/util/Expressions.class
	bin/classes/com/changlianxi/util/HttpUrlHelper.class
	bin/classes/com/changlianxi/util/HttpUtil.class
	bin/classes/com/changlianxi/util/ImageManager$1.class
	bin/classes/com/changlianxi/util/ImageManager$ImageLoaderHandler.class
	bin/classes/com/changlianxi/util/ImageManager.class
	bin/classes/com/changlianxi/util/Logger.class
	bin/classes/com/changlianxi/util/MD5.class
	bin/classes/com/changlianxi/util/PushMessageReceiver.class
	bin/classes/com/changlianxi/util/StringUtils.class
	bin/classes/com/changlianxi/util/UserInfoUtils.class
	bin/classes/com/changlianxi/util/Utils.class
	bin/classes/com/changlianxi/util/WigdtContorl.class
	bin/classes/com/changlianxi/view/FlipperLayout.class
	bin/classes/com/changlianxi/view/Home$1.class
	bin/classes/com/changlianxi/view/Home$2.class
	bin/classes/com/changlianxi/view/Home.class
	bin/classes/com/changlianxi/view/MaskedImage.class
	bin/classes/com/changlianxi/view/MessagesList$1.class
	bin/classes/com/changlianxi/view/MessagesList$GetMessagetTask.class
	bin/classes/com/changlianxi/view/MessagesList.class
	bin/classes/com/changlianxi/view/MyCard.class
	bin/classes/com/changlianxi/view/MyListView.class
	bin/classes/com/changlianxi/view/MyViewGroup.class
	bin/classes/com/changlianxi/view/PullDownView$1.class
	bin/classes/com/changlianxi/view/PullDownView.class
	bin/classes/com/changlianxi/view/QuickAlphabeticBar.class
	bin/classes/com/changlianxi/view/ScrollOverListView$1.class
	bin/classes/com/changlianxi/view/ScrollOverListView.class
	bin/classes/com/changlianxi/view/SearchEditText.class
	bin/classes/com/changlianxi/view/SetMenu$MenuModle.class
	bin/classes/com/changlianxi/view/SetMenu$MyAdapter.class
	bin/classes/com/changlianxi/view/SetMenu$ViewHolder.class
	bin/classes/com/changlianxi/view/SetMenu.class
	bin/res/drawable-xhdpi/add.png
	bin/res/drawable-xhdpi/create_account.png
	bin/res/drawable-xhdpi/icon_sms.png
	bin/res/drawable-xhdpi/icon_tel.png
	bin/res/drawable-xhdpi/sel.png
	bin/resources.ap_
	gen/com/changlianxi/activity/R.java