fix rebase conflicts
Revert "fix rebase conflicts"

This reverts commit f215ef9bc8e11d4c2e94cbe61c33f9a337fa1580.
update readme
stable version
update stable version
testing release version 0.0.5
Merge branch 'master' of github.com:Matmon/wordpress-seo-locations