@Override
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into ics-litres

Conflicts:
	src/org/geometerplus/fbreader/formats/fb2/FB2Reader.java