formatting

Conflicts:

	src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
	src/org/geometerplus/android/fbreader/library/LibraryActivity.java
formatting

Conflicts:

	src/org/geometerplus/android/fbreader/library/LibraryActivity.java
Merge branch 'master' into ice-cream-sandwich