synchronization with library-service branch
Merge branch 'master' into ice-cream-sandwich
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
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
updated package name
Merge branch 'master' into ice-cream-sandwich
Merge branch 'beta' into beta-ics
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
synchronization with library-service branch
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
encoding "detection" for xml files
Merge branch 'master' into ice-cream-sandwich