version => 2.0
Merge branch 'master' into nook

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