compilation issue
Merge branch 'master' into nook
compilation issue
Merge branch 'master' into nook

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