加入好友信息页
登录界面前期
Merge branch 'master' of https://github.com/jnuacm/BookShareClient.git

Conflicts:
	bin/BookShareClient.apk
	bin/classes.dex
	bin/resources.ap_