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

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