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