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

Conflicts:
	src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java
	src/org/geometerplus/fbreader/library/BooksDatabase.java
Merge branch 'multidirs' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
	src/org/geometerplus/android/fbreader/library/LibraryActivity.java
	src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java
	src/org/geometerplus/fbreader/formats/NativeFormatPlugin.java
updated package name
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
synchronization with library-service branch
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
encoding "detection" for xml files
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
imports cleanup
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
field renaming
SerializerUtil is used instead of Bookmark.{to,from}String methods