r
Merge branch 'master' of https://github.com/uioppo/bookshelf.git

Conflicts:
	src/com/hcctech/bookshelf/util/APIHttpClient.java