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

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

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

Conflicts:
	src/org/geometerplus/fbreader/book/BookCollection.java
Merge branch 'ice-cream-sandwich' into library-service-ics

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

Conflicts:
	src/org/geometerplus/fbreader/formats/NativeFormatPlugin.java
merge order
Merge branch 'master' into ice-cream-sandwich
Merge branch 'library-service' into library-service-ics
Merge branch 'master' into library-service