code simplification
Merge branch 'beta' into beta-ics
Merge branch 'beta-ics' into yotabeta

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java