TagTree on-the-fly
Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/fbreader/library/Library.java
Merge branch 'library-service' into library-service-ics
tag tree: fixes
Merge branch 'master' into ice-cream-sandwich
Merge branch 'library-service' into library-service-ics
Merge branch 'master' into library-service
Merge branch 'ice-cream-sandwich' into library-service-ics
series trees on-the-fly
Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/fbreader/library/Library.java
Merge branch 'library-service' into library-service-ics
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into library-service-ics
title trees on-the-fly
Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/fbreader/library/Library.java
Merge branch 'library-service' into library-service-ics
updated TODO
TitleTree fixes; added TODO from library-service branch
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into library-service

Conflicts:
	TODO.libraryService