cleanup
cleanup

Conflicts:
	src/android/patches/JellyBeanSpanFixTextView.java
Merge branch 'master' into ice-cream-sandwich
compilation issue
Merge branch 'master' into ice-cream-sandwich
imports cleanup
cleanup
Merge branch 'master' into ice-cream-sandwich
imports cleanup
imports cleanup
Merge branch 'master' into ice-cream-sandwich
imports cleanup
Merge branch 'master' into ice-cream-sandwich
imports cleanup
Merge branch 'master' into ice-cream-sandwich
imports cleanup
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/android/fbreader/network/action/RefreshRootCatalogAction.java
unused import
imports cleanup
Merge branch 'master' into ice-cream-sandwich