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

Conflicts:
	bin/InterestFriend.apk
	bin/classes.dex
	bin/classes/com/interestfriend/activity/ChatActivity$10.class
	bin/classes/com/interestfriend/activity/ChatActivity$8.class
	bin/classes/com/interestfriend/activity/ChatActivity$ListScrollListener.class
	bin/classes/com/interestfriend/activity/ChatActivity$PressToSpeakListen.class
	bin/classes/com/interestfriend/activity/ChatActivity.class
	bin/classes/com/interestfriend/activity/CircleMemberOfSelfInfoActivity.class
	bin/classes/com/interestfriend/fragment/CircleMemberFragment$MyAsyncQueryHandler.class
	bin/classes/com/interestfriend/fragment/CircleMemberFragment.class
	bin/classes/com/interestfriend/utils/HttpUrlHelper.class
	bin/classes/com/interestfriend/view/DrawerLeftMenu.class
	bin/dexedLibs/pinyin4j-2.5.0-3e842dcfbbbddf476c8f1567ed023b85.jar
	bin/proguard.txt
	bin/resources.ap_
	proguard-project.txt
	project.properties
	quyou.keystore
err log