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

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

Conflicts:
	src/org/geometerplus/fbreader/book/BookCollection.java
synchronization
Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/fbreader/book/BookCollection.java
no Book.save() call in native code
Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/fbreader/formats/NativeFormatPlugin.java
merge order
Merge branch 'master' into library-service
synchronization with library-service branch
Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/fbreader/book/Book.java
	src/org/geometerplus/fbreader/book/Bookmark.java
	src/org/geometerplus/fbreader/book/SerializerUtil.java
	src/org/geometerplus/fbreader/book/XMLSerializer.java