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
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics

Conflicts:
	src/org/geometerplus/android/fbreader/library/BookInfoActivity.java