cleanup
Merge branch 'master' into ice-cream-sandwich
imports cleanup
imports cleanup
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into ics-litres

Conflicts:
	src/org/geometerplus/zlibrary/text/hyphenation/ZLTextHyphenator.java
	src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
imports cleanup
Merge branch 'master' into ice-cream-sandwich
imports cleanup
imports cleanup
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into ics-litres
imports cleanup
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/android/fbreader/network/action/RefreshRootCatalogAction.java
Merge branch 'ice-cream-sandwich' into ics-litres

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

Conflicts:
	src/org/geometerplus/android/fbreader/style/StyleListActivity.java
imports cleanup