fixed url rewriting
Merge branch 'master' into nook
smashwords fixes
Merge branch 'master' into nook
version => 2.2 beta 8
Merge branch 'master' into nook

Conflicts:
	AndroidManifest.xml