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

Conflicts:
	bin/InterestFriend.apk
	bin/classes.dex
	bin/classes/com/interestfriend/activity/SettingActivity.class
	bin/classes/com/interestfriend/fragment/ImageFragment$1.class
	bin/classes/com/interestfriend/fragment/ImageFragment.class
	bin/classes/com/interestfriend/fragment/MyCircleFragment.class
	bin/resources.ap_
a