formatting
fixed book info saving
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
	src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java
azw3 extension
Merge branch 'master' into beta
Merge branch 'beta' of github.com:geometer/FBReaderJ into beta