sync with ics branch
Merge branch 'master' into library-service
fixed BookCollection.getBookByFile() method for fb2.zip files
static method
updated BookCollection class from library-service branch
Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/fbreader/book/Book.java