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

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

Conflicts:
	src/org/geometerplus/fbreader/library/LibraryTree.java
Merge branch 'multidirs' into beta