FavoritesTree synchronized with library-service branch
Merge branch 'master' into android-1.5
synchronization with library-service branch
Merge branch 'master' into android-1.5
synchronization with library-service branch
Merge branch 'master' into android-1.5
synchronization with library-service branch
Merge branch 'master' into android-1.5
synchronization with library-service branch
Merge branch 'master' into android-1.5

Conflicts:
	src/org/geometerplus/fbreader/library/LibraryTree.java
synchronization with library-service branch
Merge branch 'master' into android-1.5
synchronization with library-service branch
Merge branch 'master' into android-1.5