fixed book info saving
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
azw3 extension
Merge branch 'master' into ice-cream-sandwich