unused imports
unix end-of-line, @Override
unix end-of-line, @Override
Merge branch 'master' into ice-cream-sandwich
Merge branch 'beta' into beta-ics
Merge branch 'master' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
cleanup
cleanup

Conflicts:
	src/android/patches/JellyBeanSpanFixTextView.java
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
	src/org/geometerplus/android/fbreader/library/LibraryActivity.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics

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