cleanup
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle

Conflicts:
	src/org/geometerplus/android/fbreader/preferences/PreferenceActivity.java
imports cleanup
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle