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

Conflicts:
	bin/classes/com/interestfriend/activity/JoinCircleActivity.class