cleanup
Merge branch 'beta' into beta-ics
Merge branch 'beta-ics' into betayota

Conflicts:
	src/org/geometerplus/fbreader/formats/PdfPluginFormatPlugin.java