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

Conflicts:
	src/group/acm/bookshare/GenerateQRCodeActivity.java
	
Completed:
	confirm the Message by scan