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

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