completed the borrow and return function
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