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

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

Conflicts:
	src/org/geometerplus/fbreader/library/FileFirstLevelTree.java
synchronization with library-service branch
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
synchronization
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
no Book.save() call in native code
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
merge order
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/Book.java
Merge branch 'multidirs' into beta