files from library-service branch
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/fbreader/book/AbstractBookCollection.java
	src/org/geometerplus/fbreader/book/AbstractSerializer.java
	src/org/geometerplus/fbreader/book/IBookCollection.java
Merge branch 'library-service' into library-service-ics
Merge branch 'ice-cream-sandwich' into library-service-ics