version => 2.0
Merge branch 'master' into beta

Conflicts:
	AndroidManifest.xml
BookUrlInfo.Format has gone
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/fbreader/network/opds/OPDSBookItem.java