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