Merge branch 'master' of https://github.com/jnuzh/BookShareClient.git

Conflicts:
	res/values/strings.xml
	src/group/acm/bookshare/FriendsInformationActivity.java
	src/group/acm/bookshare/MainActivity.java
Merge branch 'master' of https://github.com/jnuzh/BookShareClient.git
部分修改
completed the informlist
Merge branch 'master' of https://github.com/jnuzh/BookShareClient.git

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	src/group/acm/bookshare/BarCodeTestActivity.java
	src/group/acm/bookshare/CaptureActivity.java
	src/group/acm/bookshare/MainActivity.java