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

Conflicts:
	bin/InterestFriend.apk
	bin/resources.ap_