Added "country" file and fixed some bugs that would break MODX manager.
Merge branch 'release-2.2' of https://github.com/spaceship8/revolution.git into release-2.2