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

Conflicts:
	src/org/geometerplus/zlibrary/text/view/ZLTextView.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
imports cleanup
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
imports cleanup
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
imports cleanup
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/android/fbreader/network/action/RefreshRootCatalogAction.java
Merge branch 'master' into beta