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

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