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

Conflicts:
	src/org/geometerplus/android/fbreader/BookmarksActivity.java
	src/org/geometerplus/android/fbreader/SelectionBookmarkAction.java
	src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
	src/org/geometerplus/fbreader/book/AbstractBookCollection.java
	src/org/geometerplus/fbreader/book/BooksDatabase.java
	src/org/geometerplus/fbreader/bookmodel/JavaBookModel.java
Merge branch 'library-service' into library-service-ics
Merge branch 'ice-cream-sandwich' into library-service-ics
updated package name
Merge branch 'master' into ice-cream-sandwich
Merge branch 'library-service' into library-service-ics
Merge branch 'master' into library-service
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/android/fbreader/libraryService/BookCollectionShadow.java
	src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
Merge branch 'library-service' into library-service-ics
Merge branch 'ice-cream-sandwich' into library-service-ics
encoding "detection" for xml files
Merge branch 'master' into ice-cream-sandwich
Merge branch 'library-service' into library-service-ics
Merge branch 'master' into library-service