database parameter in FileInfoSet constructors
Merge branch 'master' into library-service

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