FavoritesTree synchronized with library-service branch
Merge branch 'master' into ice-cream-sandwich
synchronization with library-service branch
Merge branch 'master' into ice-cream-sandwich
synchronization with library-service branch
Merge branch 'master' into ice-cream-sandwich
synchronization with library-service branch
Merge branch 'master' into ice-cream-sandwich
synchronization with library-service branch
Merge branch 'master' into ice-cream-sandwich

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