Initial commit.
Resolved conflicts.
Merge branch 'master' of github.com:CRTX/PHPCountryISOBundle