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

Conflicts:
	bin/InterestFriend.apk
	bin/classes.dex
	bin/classes/com/interestfriend/fragment/MyCircleFragment$2.class
	bin/classes/com/interestfriend/fragment/MyCircleFragment.class
	src/com/interestfriend/fragment/MyCircleFragment.java
表情