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
updated package name
Merge branch 'master' into multidirs
synchronization with library-service branch
Merge branch 'master' into multidirs
encoding "detection" for xml files
Merge branch 'master' into multidirs
imports cleanup
Merge branch 'master' into multidirs